Updated HMatrix bug