Thanks to f0o for this fix. Bye bye issue #202
Merge pull request #203 from toyowheelin/issue-202

Thanks to f0o for this fix. Bye bye issue #202