Updated Field.java to be consistent with master