Fixed hashing behaviour

This should have been part of the previous commit.