G fix (16/35)

G fix