Yet another fix for #228
Merge pull request #235 from rashidkpc/master

Yet another fix for #228