issue 2 fixed