Bugfix. Mapper trying to save long.