diff --git a/src/code_manager/model/CssGenerator.js b/src/code_manager/model/CssGenerator.js
index f80821676..87c168f64 100644
--- a/src/code_manager/model/CssGenerator.js
+++ b/src/code_manager/model/CssGenerator.js
@@ -1,5 +1,7 @@
 import { isUndefined } from 'underscore';
 
+const maxValue = Number.MAX_VALUE;
+
 module.exports = require('backbone').Model.extend({
   initialize() {
     this.compCls = [];
@@ -68,6 +70,8 @@ module.exports = require('backbone').Model.extend({
         code += this.buildFromRule(rule, dump, opts);
       });
 
+      console.log('at rules', atRules);
+
       // Get at-rules
       for (let atRule in atRules) {
         let rulesStr = '';
@@ -126,5 +130,17 @@ module.exports = require('backbone').Model.extend({
     }
 
     return result;
+  },
+
+  /**
+   * Get the numeric length of the media query string
+   * @param  {String} mediaQuery Media query string
+   * @return {Number}
+   */
+  getQueryLength(mediaQuery) {
+    const length = /(-?\d*\.?\d+)\w{0,}/.exec(mediaQuery);
+    if (!length) return maxValue;
+
+    return parseFloat(length[1]);
   }
 });
diff --git a/src/css_composer/view/CssRulesView.js b/src/css_composer/view/CssRulesView.js
index 9b6cd0684..587da5c88 100644
--- a/src/css_composer/view/CssRulesView.js
+++ b/src/css_composer/view/CssRulesView.js
@@ -89,7 +89,6 @@ module.exports = Backbone.View.extend({
       // Try to find a specific container for the rule (if it
       // containes a media query), otherwise get the default one
       try {
-        console.log('try to find ID', blockId);
         contRules = container.querySelector(`#${blockId}`);
       } catch (e) {}
 
diff --git a/test/specs/css_composer/view/CssRulesView.js b/test/specs/css_composer/view/CssRulesView.js
index 00eb1a828..adc560e86 100644
--- a/test/specs/css_composer/view/CssRulesView.js
+++ b/test/specs/css_composer/view/CssRulesView.js
@@ -61,7 +61,9 @@ module.exports = {
               ((right && right.replace('px', '')) || Number.MAX_VALUE) -
               ((left && left.replace('px', '')) || Number.MAX_VALUE)
             );
-          });
+          })
+          .map(widthMedia => parseFloat(widthMedia));
+
         foundStylesContainers.each(($styleC, idx) => {
           const width = sortedDevicesWidthMedia[idx];
           expect($styleC.id).toEqual(`${prefix}${width ? `-${width}` : ''}`);