Bugfix for dispatch