fixes #18331

@rallytime as requested, 

best regards,
  wuxxin