Merge: String hash function fix