CLI Fix