Small improvement over the last commit