Fixed GC problem