Fix issue with multiple files from command line