fixed server message passing