fix testissue 3 and 4