fix message routing