~ Improvement for #26.