Use new signature introduced in #330