Circular reference fixed

Fixes #1