Fix for an Issue #683