diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9acfa4de25..72919a93017 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ vNext
 - Fixes regex InfluxDB queries intoduced in 1.6.0 (PR #500)
 - Bug in when using % sign in legends (aliases), fixed by removing url decoding of metric names (Fixes #506)
 - Series names and column name typeahead cache fix (Fixes #522)
+- Fixed influxdb issue with raw query that caused wrong value column detection (Fixes #504)
 
 # 1.6.0 (2014-06-16)
 
diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js
index 9b61df3914e..d3adca618b7 100644
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -43,7 +43,7 @@ function (angular, _, kbn) {
           var groupByIndex = lowerCaseQueryElements.indexOf("group");
           var orderIndex = lowerCaseQueryElements.indexOf("order");
 
-          if (lowerCaseQueryElements[1].indexOf(',')) {
+          if (lowerCaseQueryElements[1].indexOf(',') !== -1) {
             groupByField = lowerCaseQueryElements[1].replace(',', '');
           }