By Benjamin. Fix 2526.