HP fix: part 2
Merge pull request #5360 from illi-kun/patch-1

HP fix: part 2