Bug fixing: Scenario management