Fixed the GC issues