issue 2 solved