Fix issue1702