Fix wander bug