diff --git a/sample-functions/AlpineFunction/Dockerfile b/sample-functions/AlpineFunction/Dockerfile
index b1f200a6850cbedcb70a3b7b4ff754fde034ad73..1638a01d8e9bd132705ce6ab9571b50b4fee1649 100644
--- a/sample-functions/AlpineFunction/Dockerfile
+++ b/sample-functions/AlpineFunction/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:latest
 
-ADD https://github.com/alexellis/faas/releases/download/0.5.6-alpha/fwatchdog /usr/bin
+ADD https://github.com/alexellis/faas/releases/download/0.6.5/fwatchdog /usr/bin
 # COPY ./fwatchdog /usr/bin/
 RUN chmod +x /usr/bin/fwatchdog
 
diff --git a/watchdog/main.go b/watchdog/main.go
index 5aaaf15d907e209f5d945d387b1210ce98f86dfd..1f0ad9239cd75b8d29c17260377c37530b85f0eb 100644
--- a/watchdog/main.go
+++ b/watchdog/main.go
@@ -200,8 +200,9 @@ func getAdditionalEnvs(config *WatchdogConfig, r *http.Request, method string) [
 
 		envs = append(envs, fmt.Sprintf("Http_Method=%s", method))
 
-		if len(r.URL.RawQuery) > 0 {
-			envs = append(envs, fmt.Sprintf("Http_Query=%s", r.URL.RawQuery))
+		log.Println(r.URL.String())
+		if len(r.URL.String()) > 0 {
+			envs = append(envs, fmt.Sprintf("Http_Query=%s", r.URL.String()))
 		}
 	}