G fix (17/35)

G fix