HME bug fix