more attempts at server fixing