Fix for circular depenency problem

Fixes #98.