Fix server bug