CLI Thread Option bugfix