Fixing bug in move all feature