Doesn't this break the existing functionality when using it in the CLI?