[#2] solved second issue