- Fix for different file handling