fixed last GC issues