Fix dispatcher to the original one