Fix #289
Tweak movement