Fixed issues using total validator