bugfix on part 3