Fix BaseFile