Fix hashing of values