Fix issue with determining field name