Followup of #382
Followup of #382