Circular reference issue *should* be resolved now