follow up of #3827
follow up of #3827