fixing message order