Fix for Issue #37