Bugfix/2 dependency cycle

Fixes #2