Fixing GC-related issue