Merge pull request #3 from Aldone/circular-reference-workaround

Circular reference workaround