fix #9430 followup 7a9e682