Fixed circular reference "issues"