Fix handling area changes in walk state