Clean bugfix for gc-bug.