Fix 1.589 changes