issue 51 fixed