Fixed GC problems, again...