Followup to #366
Followup to #366