debug removed + bugfix