Fixing FileEntryTool