Fix messages routing error