Validator fixed. Again