Revert "Fix issue #19"

This reverts commit 2c14ec5f800b8ef6527f05ba26d6c6cca4b417d8.
Clean fix issue #19

Isolate and commit fix for issue #19 without potential for regressions.