fix __Server__ and __Control__ bugs