Fix server propagation