Fix for components, conditions, variants