Fix for Issue #237