Monitor server fix