#197 Commiting fix for the issue. Pending approval