Fixed bug that deals with the server side