Fix move event again