diff --git a/lib/cartodb/models/dataview/formula.js b/lib/cartodb/models/dataview/formula.js
index 1421032d..04b89835 100644
--- a/lib/cartodb/models/dataview/formula.js
+++ b/lib/cartodb/models/dataview/formula.js
@@ -10,8 +10,10 @@ var formulaQueryTpl = dot.template([
     '  {{=it._operation}}({{=it._column}}) AS result,',
     '  (SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls WHERE {{=it._column}} IS NULL) AS nulls_count',
     '  {{?it._operation!==\'count\'}}',
-    '  ,(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls WHERE {{=it._column}} = \'infinity\'::float OR {{=it._column}} = \'-infinity\'::float) AS infinities_count',
-    '  ,(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls WHERE {{=it._column}} = \'NaN\'::float) AS nans_count',
+    '  ,(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls',
+    '      WHERE {{=it._column}} = \'infinity\'::float OR {{=it._column}} = \'-infinity\'::float) AS infinities_count',
+    '  ,(SELECT count(1) FROM ({{=it._query}}) _cdb_formula_nulls',
+    '      WHERE {{=it._column}} = \'NaN\'::float) AS nans_count',
     '  {{?}}',
     'FROM ({{=it._query}}) _cdb_formula',
     '{{?it._operation!==\'count\'}}',
diff --git a/test/acceptance/dataviews/formula.js b/test/acceptance/dataviews/formula.js
index 93db6b38..585a3b82 100644
--- a/test/acceptance/dataviews/formula.js
+++ b/test/acceptance/dataviews/formula.js
@@ -71,7 +71,7 @@ describe('formula-dataview: special float valuer', function() {
         this.testClient = new TestClient(mapConfig, 1234);
         this.testClient.getDataview('val_formula', {}, function(err, dataview) {
             assert.ok(!err, err);
-            assert.equal(dataview.result, 501)
+            assert.equal(dataview.result, 501);
             assert.ok(dataview.infinities === (250 + 250));
             assert.ok(dataview.nans === 250);
             done();