Small improvement for some cases.