HM8 & Fix for HM7 for the purpose of testing