h1/h2 pair mismatch fix