Strange bug with filenames
Restore true filenames