Followup after #246 is merged
Followup after #246 is merged