Made the dispatcher 4.4.0 compatible