Ugly workaround to get better dispatcher results