Fix comment tracking