Bugfix: Stackoverflow