HP bug fix