Fixed the field-mess(-up)