Fix for an Issue #687