Fixes Issue #43