Fix for different files objects