nit picked in latest commit