Fix diverging older version