Fixes part 3