Further improvement for #451