Fixed erroneous mapping of fields

fa246c6 Fixed erroneous mapping of fields