(Issue #3579) followup from review