Garbage collection fix