Added more ordering to ensure that hashes match