[#GI5] fixed the issue in bug5