Fixed multi file handling