Please add my critical bug fix

Please add my critical bug fix
//comment added by sajeevth