Change validator contract - never alter the returned value