Small bugfix & removed debug output