Fixup callback signature