G fix (32/35)

G fix