Fix for an Issue #648