diff --git a/src/lib/ebus/data.cpp b/src/lib/ebus/data.cpp
index 86522f09..0e35abed 100644
--- a/src/lib/ebus/data.cpp
+++ b/src/lib/ebus/data.cpp
@@ -92,7 +92,7 @@ static const dataType_t dataTypes[] = {
 #define MAX_DIVISOR 1000000000
 
 /** the maximum value for value lists. */
-#define MAX_VALUE (1<<24)
+#define MAX_VALUE (0xFFFFFFFFu)
 
 /** the week day names. */
 static const char* dayNames[] = {"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"};
diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp
index 064c6e3e..abf1fb87 100644
--- a/src/lib/ebus/test/test_data.cpp
+++ b/src/lib/ebus/test/test_data.cpp
@@ -240,6 +240,8 @@ int main()
 		{"x,,ulg", "-",          "10feffff04ffffffff", "00", ""},
 		{"x,,ulg,10","3.8",      "10feffff0426000000", "00", ""},
 		{"x,,ulg,-10","380",     "10feffff0426000000", "00", ""},
+		{"x,,ulg,0x0FF0F00F=VRT 350;0x33CCCC33=VRT 360;0x3CC3C33C=SD 17;0x66999966=SD 37;0x69969669=VRT 360+",
+			"VRT 350",         "10feffff040FF0F00F", "00", ""},
 		{"x,,ulr", "38",         "10feffff0400000026", "00", ""},
 		{"x,,ulr", "0",          "10feffff0400000000", "00", ""},
 		{"x,,ulr", "4294967294", "10feffff04fffffffe", "00", ""},