Bugfix for Issue #20