Fix Constraint Format Builder