Follow-up of #482
Follow-up of #482