issue 25 fixed