issue 506 fixed