Fix server for real