Bugfix part 2