Fixes Issue #29