Fix for the validator