followup of #5635
followup of #5635