Copy-of name does not handle extensions properly

The new feature included with version 1.41 calculates copy-of names as:
name.ext - copy/name.ext - copy (2).

It should handle it in the following way:
name - copy.ext/name - copy (2).ext