Correct handling of case when "file" is passed in as a keyword

Closes #135