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

This addresses issue #202