Fix for Issue #71