Improvement for #20