Fix for object_tracker not resolving LazyEntityReferences correctly