Fixing CLI once again