Fix for an Issue #517