Fix issue with routing messages on the server