Fixing field constraints (see #329)