Fixed GH-20 "Numbers are stripped from filenames on save"