Added OnServerMessage from fixes2