Fix for Issue #630