I have attached a patch for same. please review