Fixed HW scenario bug