bugfix implemented