Fixed handling of two files together