Fix currentScenario passing