[#73593206] base/data-mapper - tested, and damn well should have :/