diff --git a/source/backend/CarlaStandalone.cpp b/source/backend/CarlaStandalone.cpp
index cd7d7aa75..26b3a9e4f 100644
--- a/source/backend/CarlaStandalone.cpp
+++ b/source/backend/CarlaStandalone.cpp
@@ -1848,6 +1848,8 @@ const char* carla_get_host_osc_url_udp()
 
 #define CARLA_PLUGIN_UI_CLASS_PREFIX Standalone
 #include "CarlaPluginUI.cpp"
+#undef CARLA_PLUGIN_UI_CLASS_PREFIX
+
 #include "CarlaDssiUtils.cpp"
 #include "CarlaPatchbayUtils.cpp"
 #include "CarlaPipeUtils.cpp"
diff --git a/source/carla_widgets.py b/source/carla_widgets.py
index 6013a1dcc..acb0d20a4 100755
--- a/source/carla_widgets.py
+++ b/source/carla_widgets.py
@@ -312,7 +312,7 @@ class PluginParameter(QWidget):
             self.ui.sb_control.setValue(-1)
         else:
             selControlStr = actSel.text()
-            selControl    = int(selControlStr.split(" ", 1)[0], 16)
+            selControl    = int(selControlStr.split(" ", 1)[0].replace("&",""), 16)
             self.ui.sb_control.setValue(selControl)
 
     @pyqtSlot()