Fix external procedure support