#33 fix for data objects