Fixes Issue #20