Yet another fix for EntitlementContext producers...