Added HM safeguard.