re-added the g1 == 1 case