Another fix for h2.