Fix handling of the new hash format