Fix inherited contexts