hot fixes part 2