Remove Scenario and fixed Then reference.