issue 465 fixed