Another update due to H2 version upgrade