Fix and test for Issue #41