(Issue #3715) followup from review