I have fixed the issue, provided patch for same. please review