Fixes Issue #19

Might interfere with pull request for issue #18