Fix a bug around HPR