Fixed the validate