Hack to provide temp workaround for circular reference converting to json