issue 1 solved