Bug fix with server.cs