fix for bugId:96416