Fix circular references problem #6