bugfix circular reference