edispatch fixed