Move cursor location fix #476