Fix broken copy and move commands from spaces