got rid of hack for comment stream