Fixes Issue #41