First hack at the GC fix, although still not working.