Quick fix for scenario