Server-side: fix