Fix broken dispatcher of requests