Follow-up of #386
Follow-up of #386