Server rebroadcast fix