Emergency fix for comment comments