HP fix: part 2