Fixed a bug with the MainServer