Fixed bug with server messages