Fix g2s subtree try 2

—