Fixing mv issue