Fix for Issue #70