Fixed multiple file support