Fixes validation on server-side