move menu swap bugfix