fix message ordering