issue4 fixed