Fix for movement in Esc