Follow-up of #262
Follow-up of #262