Fix server controller