fix boat movement handling