Fixes Issue #47