[#1] resolved first issue