Fix for an Issue #653