Follow-up to #178, which was the source of regression here. 