diff --git a/src/blenderbim/blenderbim/bim/module/drawing/data.py b/src/blenderbim/blenderbim/bim/module/drawing/data.py
index c96d08450e..850ee6c9c0 100644
--- a/src/blenderbim/blenderbim/bim/module/drawing/data.py
+++ b/src/blenderbim/blenderbim/bim/module/drawing/data.py
@@ -29,9 +29,9 @@ def refresh():
     SheetsData.is_loaded = False
     SchedulesData.is_loaded = False
     DrawingsData.is_loaded = False
+    AnnotationData.is_loaded = False
     DecoratorData.data = {}
     DecoratorData.cut_cache = {}
-    AnnotationData.is_loaded = False
 
 
 class ProductAssignmentsData:
diff --git a/src/blenderbim/blenderbim/bim/module/drawing/decoration.py b/src/blenderbim/blenderbim/bim/module/drawing/decoration.py
index b72547a500..4933464b41 100644
--- a/src/blenderbim/blenderbim/bim/module/drawing/decoration.py
+++ b/src/blenderbim/blenderbim/bim/module/drawing/decoration.py
@@ -407,21 +407,13 @@ class BaseDecorator:
         blf.disable(font_id, blf.ROTATION)
 
     def format_value(self, context, value):
-        unit_system = context.scene.unit_settings.system
-        if unit_system == "IMPERIAL":
-            precision = context.scene.BIMProperties.imperial_precision
-            if precision == "NONE":
-                precision = 256
-            elif precision == "1":
-                precision = 1
-            elif "/" in precision:
-                precision = int(precision.split("/")[1])
-        elif unit_system == "METRIC":
-            precision = 4
-        else:
-            return
-
-        return bpy.utils.units.to_string(unit_system, "LENGTH", value, precision=precision)
+        return bpy.utils.units.to_string(
+            context.scene.unit_settings.system,
+            "LENGTH",
+            value,
+            precision=4,
+            split_unit=context.scene.unit_settings.system == "IMPERIAL",
+        )
 
 
 class DimensionDecorator(BaseDecorator):