Bugfix and new bug