added better handling of non-standard filenames