Fix create_scenario as well