Partial fix for Issue #41