Should address SMOKE failures