Fixed changes in File handling again