Attempt 2 at fixing GC