#1442 issue fixs