improvement for #754