Fixed mixed-up validators