Improving the fix

[permalink]