fix us some data objects #9