Fixed dispatching (cleanup to call).