Fix for scenario list