diff --git a/core/models/sessions.go b/core/models/sessions.go
index e85a249b3..e32e39c20 100644
--- a/core/models/sessions.go
+++ b/core/models/sessions.go
@@ -883,7 +883,7 @@ RETURNING contact_id`
 const sqlExitSessionRuns = `
 UPDATE flows_flowrun
    SET exited_on = $2, status = $3, modified_on = NOW()
- WHERE id = ANY (SELECT id FROM flows_flowrun WHERE session_id = ANY($1) AND status IN ('A', 'W'))`
+ WHERE session_id = ANY($1) AND status IN ('A', 'W')`
 
 const sqlExitSessionContacts = `
  UPDATE contacts_contact 
diff --git a/go.mod b/go.mod
index 9410c8b53..1c4607432 100644
--- a/go.mod
+++ b/go.mod
@@ -16,8 +16,8 @@ require (
 	github.com/jmoiron/sqlx v1.3.4
 	github.com/lib/pq v1.10.4
 	github.com/nyaruka/ezconf v0.2.1
-	github.com/nyaruka/gocommon v1.21.0
-	github.com/nyaruka/goflow v0.160.0
+	github.com/nyaruka/gocommon v1.22.0
+	github.com/nyaruka/goflow v0.161.1
 	github.com/nyaruka/logrus_sentry v0.8.2-0.20190129182604-c2962b80ba7d
 	github.com/nyaruka/null v1.2.0
 	github.com/nyaruka/redisx v0.2.1
diff --git a/go.sum b/go.sum
index 57f1df094..158db9c11 100644
--- a/go.sum
+++ b/go.sum
@@ -119,10 +119,10 @@ github.com/naoina/toml v0.1.1 h1:PT/lllxVVN0gzzSqSlHEmP8MJB4MY2U7STGxiouV4X8=
 github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
 github.com/nyaruka/ezconf v0.2.1 h1:TDXWoqjqYya1uhou1mAJZg7rgFYL98EB0Tb3+BWtUh0=
 github.com/nyaruka/ezconf v0.2.1/go.mod h1:ey182kYkw2MIi4XiWe1FR/mzI33WCmTWuceDYYxgnQw=
-github.com/nyaruka/gocommon v1.21.0 h1:nu7M2cdSPrkqUPdGsEeWX047+neo69H4x+4g/OKpoLM=
-github.com/nyaruka/gocommon v1.21.0/go.mod h1:cv9r6amof1gSktfPZROClZhLFzdSIH/N9KbW6Nny4g8=
-github.com/nyaruka/goflow v0.160.0 h1:eBaokSbxnwr39SLd1Yqd/zALusdyviVxCoceyRZQGnY=
-github.com/nyaruka/goflow v0.160.0/go.mod h1:iLYZOLLggFRR8e5dVgFEmB95W4FPrIKbz3w3C6Ia/0g=
+github.com/nyaruka/gocommon v1.22.0 h1:ptlZftc7ZKDF81NRUW2H4NOlIQO144m3wvkTO1d+yms=
+github.com/nyaruka/gocommon v1.22.0/go.mod h1:cv9r6amof1gSktfPZROClZhLFzdSIH/N9KbW6Nny4g8=
+github.com/nyaruka/goflow v0.161.1 h1:Bv7mVfoMUEHlWSxH5UFm79NabDRAmObaeLF36DnKH2w=
+github.com/nyaruka/goflow v0.161.1/go.mod h1:EzoWswRVBoCtyYbbA0gAyhBirw5wO2Wp1QdnSt6bGqk=
 github.com/nyaruka/librato v1.0.0 h1:Vznj9WCeC1yZXbBYyYp40KnbmXLbEkjKmHesV/v2SR0=
 github.com/nyaruka/librato v1.0.0/go.mod h1:pkRNLFhFurOz0QqBz6/DuTFhHHxAubWxs4Jx+J7yUgg=
 github.com/nyaruka/logrus_sentry v0.8.2-0.20190129182604-c2962b80ba7d h1:hyp9u36KIwbTCo2JAJ+TuJcJBc+UZzEig7RI/S5Dvkc=