reduce 2x map; fixes datamapper eager loading
Merge pull request #210 from tpitale/master

Reduce double map to once; Fixes datamapper eager loading.