Server-side bug fixed