Bugfix for Issue #212
Merge pull request #252 from flash1293/bugfix

Bugfix for Issue #212