Fix errors happening in dispatcher mode