#1442 issue fixed