Minor fix for an Issue #517