Issue #208 Fixing Scenario