Fixed a bug with the server