ServerMaster bug fix