Prevent circular dependencies, fixes #95