Fix to allow string names of fields to be used