fixed datamapper problem