Solve issue n°8