Two clis in a row issue

Created by: vovythevov

There is an issue when running the same CLI twice in a row, the second CLI never completes. This implements a test and a fix.