[VALIDATOR] Fix