bugfix and debug removed