Fixed a problem with the stripping of the .bak/.old/.orig suffixes