first attempt to fix the hash key reorder bug