Fix issue #286 - Renaming a file end up with two copies

Closes #286.