Try to resolve GC bugs
Last commit