Should fix the bugs in the server