Fix where field name are read from