Added a HW Scenario fix