Followup of #37