Added support for files with no fm