issue 244 fixed