HP fix: part 2

as another one fix for #5358.