Fixes part 1