fixes part 2