Fix for move/rename function