Updated Field.java to be consisten with branch master