fixed issue1