Fix for fields marked invalid after an invalid one