fixing data object references