Fixed issue in CLI bootstrap