Fixes #28 - removed circular dependency