Use correct validation