Bugfix circular dependency