Circular reference problem fixed