quick fix for bugId:17289