Small improvement for #115