Fixed move-after-click bug