bugfix part 2