fixed loop in dispatch to issue