Master server fix.