Fix AAE rehash to work when data is missing