Fixing the Orchestrate code issue