Fixed problem in the record mapper