follow-up of #35
follow-up of #35