Fix parsing of files