I have attached a patch for same. Please review