Fix for fields marked invalid after the first one