We now create a field reference when calling the builder instead of using the value as is. Original pull request: #818.