Update move instead of copy to work around issue on some filesystems. Fixes #677