diff --git a/.travis.yml b/.travis.yml
index 199308b..85ec3f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ go:
   - master
 
 before_script:
-  - go get github.com/golang/lint/golint
+  - go get golang.org/x/lint/golint
   - go get honnef.co/go/tools/cmd/staticcheck
   - go get github.com/golang/dep/cmd/dep
 
diff --git a/waflyctl.go b/waflyctl.go
index b9704ff..6822322 100644
--- a/waflyctl.go
+++ b/waflyctl.go
@@ -1358,7 +1358,7 @@ func WithShieldingCondition(client fastly.Client, serviceID string, version int,
 		Service:   serviceID,
 		Version:   version,
 		Name:      "waf-soc-with-shielding",
-		Statement: "!req.backend.is_shield",
+		Statement: "waf.executed || fastly_info.state == \"HIT\"",
 		Type:      "RESPONSE",
 		Priority:  10,
 	})