Fixup procedure calling