Fix for Issue #60