Fix 14424 and 14367
Merge pull request #126 from vishalduggal/timob-14424

Fix 14424 and 14367