First Class h3 fix