Bugfix added a new bug