Update from my fork that includes gc fix

Update from my fork that includes gc fix