bug fix dispatching prematurely