Yet another bug fix in servercontrol