Fixed bug in Server