Experimental fix of potential race in gc