Follow up to #371 [skip ci]