Get rid of the double h2