Fixup as per @chvest comment