Last adjustments concerning bug #13727