Fixed a server breaking bug