bugfix part 1