Fixed bug that broke capture mode after clean up