new fix for comments