[#GI1] fixed the issue in Bug1