issue 8 fixed