Fixed the fact that there's SafeValidator