fix DBObjectMap ... DO NOT MERGE