Fix 1.8 build (hash ordering issue)