complex filenames fix