issue 3 fixed