quick fix for p2 bugId:95971 which was fixed in dev branch at first