Fix circular reference bug