Fix for Issue #35