Fix comment threading