Fix messages ordering