fixed gc issues from last commit..