Fix hashing again: this time for good