[NF] Small improvement (#31).