Fix problem created after the context value was changed to use EntityType's guid.