fixed new circular reference issue