potential improvement for #459