issue 7 fixed