fix current dispatching