Fix to hang move when settings are changed