Fix dispatcher