1st hot fix done by kumarshiv
2nd hot fix done by kumarshiv