diff --git a/ceammc/ext/src/lib/cicm/Sources/cicm_common.tcl b/ceammc/ext/src/lib/cicm/Sources/cicm_common.tcl
index c7cd6e8950..e8f55efe75 100644
--- a/ceammc/ext/src/lib/cicm/Sources/cicm_common.tcl
+++ b/ceammc/ext/src/lib/cicm/Sources/cicm_common.tcl
@@ -135,9 +135,10 @@ ceammc_create_label_font_bold CICMCategoryFont
 
 # show tooltips
 if { [catch package require tooltip] } {
-    if { [catch source tooltip/tooltip.tcl] } {
-        ::pdwindow::error "can't load tooltip plugin"
-        proc tooltip {args} {}
+    namespace eval ::tooltip:: {
+        namespace export tooltip
     }
+
+    proc ::tooltip::tooltip {args} {}
 }
 
diff --git a/ceammc/ext/src/lib/cicm/Sources/cicm_common.tcl.h b/ceammc/ext/src/lib/cicm/Sources/cicm_common.tcl.h
index b4a45cf96a..07d247c2fc 100644
--- a/ceammc/ext/src/lib/cicm/Sources/cicm_common.tcl.h
+++ b/ceammc/ext/src/lib/cicm/Sources/cicm_common.tcl.h
@@ -110,10 +110,10 @@ const char* cicm_common_tcl =
 "    -data \"R0lGODlhEgASAIABAAAAAP///yH5BAEKAAEALAAAAAASABIAAAIajI+py+0PA4gITGoszhdr30FfNIqhuKXqChUAOw==\"\n"
 "ceammc_create_label_font_bold CICMCategoryFont\n"
 "if { [catch package require tooltip] } {\n"
-"    if { [catch source tooltip/tooltip.tcl] } {\n"
-"        ::pdwindow::error \"can't load tooltip plugin\"\n"
-"        proc tooltip {args} {}\n"
+"    namespace eval ::tooltip:: {\n"
+"        namespace export tooltip\n"
 "    }\n"
+"    proc ::tooltip::tooltip {args} {}\n"
 "}\n"
 ;
 #endif