[FIX] some fixing for GC