WorkUnitEntity Fix