Correcting to server-side variant