Fix for hash functions