Move operation bugfix