Followup of #47
Followup of #47