Third go at fixing images