Fix of new policy components