Draft: Workaround ghost errors in move tool