Garbage collection fixed