Fixes Issue #46