Bug fix in servercontrol