Fixup for new API call