AB - Fixed closure of server