Fixed issue with the CLI Workaround