Fix 8859

Hope that's "better" this way