Fixes part 2