Fixed invalid fields again