Bugfix part 1