Fix for Issue #30