Fixing support for --file