Improve reliability
Catch single-quoted file names