new fix for entities