Small code improvement of previous commit