BF: Apply same fix for GenericDirEntry as done for PosixDirEntry