Fix for scenario parser