#13 - Trying to resolve issue with Datamapper