Fixed bug in server