(Issue #3781) follow up from review