Small bugfix part 2