Minor improvment of the last commit