diff --git a/editor/browser.js b/editor/browser.js
index 2906572f..af114228 100644
--- a/editor/browser.js
+++ b/editor/browser.js
@@ -17,7 +17,6 @@ var svgedit = svgedit || {};
 if (!svgedit.browser) {
 	svgedit.browser = {};
 }
-
 var supportsSvg_ = (function() {
         return !!document.createElementNS && !!document.createElementNS('http://www.w3.org/2000/svg', 'svg').createSVGRect;
 })();
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index 352e0835..2b940aeb 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -5577,7 +5577,7 @@ var setUseData = this.setUseData = function(parent) {
 		if(!ref_elem) return;
 		$(this).data('ref', ref_elem);
 		if(ref_elem.tagName == 'symbol' || ref_elem.tagName == 'svg') {
-			$(this).data('symbol', ref_elem);
+			$(this).data('symbol', ref_elem).data('ref', ref_elem);
 		}
 	});
 }
@@ -6062,7 +6062,7 @@ this.importSvgString = function(xmlString) {
 		
 		use_el.setAttribute("transform", ts);
 		recalculateDimensions(use_el);
-		$(use_el).data('symbol', symbol);
+		$(use_el).data('symbol', symbol).data('ref', symbol);
 		addToSelection([use_el]);
 		
 		// TODO: Find way to add this in a recalculateDimensions-parsable way
@@ -8287,7 +8287,7 @@ this.ungroupSelectedElement = function() {
 	} else if(g.tagName === 'use') {
 		// Somehow doesn't have data set, so retrieve
 		var symbol = getElem(getHref(g).substr(1));
-		$(g).data('symbol', symbol);
+		$(g).data('symbol', symbol).data('ref', symbol);
 		convertToGroup(g);
 		return;
 	}
diff --git a/editor/svgutils.js b/editor/svgutils.js
index a5a48974..0597cc76 100644
--- a/editor/svgutils.js
+++ b/editor/svgutils.js
@@ -494,7 +494,7 @@ svgedit.utilities.getBBox = function(elem) {
 			ret = groupBBFix(selected, true);
 		}
 		
-		if((elname === 'use' && !svgedit.browser.isWebkit()) || elname === 'foreignObject') {
+		if(elname === 'use' || elname === 'foreignObject') {
 			if(!ret) ret = selected.getBBox();
 			var bb = {};
 			bb.width = ret.width;