Fix eventual stack overflow after clean cmd