Fix server-side problem