diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index 8c0d976a3..468593d51 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -66,7 +66,7 @@ Template.viewer.onCreated(() => {
 
     const patientId = instance.data.studies[0].patientId;
     const filter = {
-        'patientId': patientId
+        patientId
     };
 
     const timepointsPromise = instance.data.timepointApi.retrieveTimepoints(filter);
@@ -132,7 +132,7 @@ Template.viewer.events({
         OHIF.measurements.MeasurementHandlers.onRemoved(event, instance, eventData);
     },
     CornerstoneToolsMouseClick(event, instance, data) {
-        const element = instance.$('.imageViewerViewport')[0];
+        const element = event.target;
 
         const toolState = cornerstoneTools.getToolState(element, 'bidirectional');
 
@@ -141,10 +141,6 @@ Template.viewer.events({
             return;
         }
 
-        const selectLabelCallback = (options, value, description) => {
-            console.warn('>>>>options, value, description', options, value, description);
-        };
-
         setTimeout(() => {
             for (let i = 0; i < toolState.data.length; i++) {
                 const toolData = toolState.data[i];
@@ -154,8 +150,7 @@ Template.viewer.events({
                         toolData,
                         element,
                         measurementApi: instance.data.measurementApi,
-                        position: data.currentPoints.page,
-                        callback: selectLabelCallback
+                        position: data.currentPoints.page
                     });
                     break;
                 }
diff --git a/Packages/ohif-measurements/client/lib/toggleLabelButton.js b/Packages/ohif-measurements/client/lib/toggleLabelButton.js
index 506f07b1b..032f5ca35 100644
--- a/Packages/ohif-measurements/client/lib/toggleLabelButton.js
+++ b/Packages/ohif-measurements/client/lib/toggleLabelButton.js
@@ -1,5 +1,6 @@
 import { Template } from 'meteor/templating';
 import { Blaze } from 'meteor/blaze';
+import { _ } from 'meteor/underscore';
 import { OHIF } from 'meteor/ohif:core';
 
 const toolMap = {
@@ -32,7 +33,9 @@ OHIF.measurements.toggleLabelButton = options => {
         hideCommon: true,
         toolType: options.toolData.toolType,
         doneCallback(location, description) {
-            options.callback(options, location, description);
+            if (_.isFunction(options.callback)) {
+                options.callback(options, location, description);
+            }
 
             toolCollection.update(measurement._id, {
                 $set: {