G fix (26/35)

G fix