Quick and dirty fix for a race condition during dispatch