Fix for dispatching