[#GI2] fixed the issue in Bug2