Clean the fields differently for the new constraints.