Fix for Issue #86