diff --git a/core-api/src/main/java/com/optimizely/ab/config/audience/match/SemanticVersion.java b/core-api/src/main/java/com/optimizely/ab/config/audience/match/SemanticVersion.java
index 9e37ac02b..f0b80462c 100644
--- a/core-api/src/main/java/com/optimizely/ab/config/audience/match/SemanticVersion.java
+++ b/core-api/src/main/java/com/optimizely/ab/config/audience/match/SemanticVersion.java
@@ -17,8 +17,10 @@
 package com.optimizely.ab.config.audience.match;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.optimizely.ab.internal.AttributesUtil.parseNumeric;
 import static com.optimizely.ab.internal.AttributesUtil.stringIsNullOrEmpty;
@@ -144,7 +146,7 @@ public String[] splitSemanticVersion() throws Exception {
             // major.minor.patch
             versionPrefix = partialVersionParts[0];
 
-            versionSuffix = partialVersionParts[1];
+            versionSuffix = Arrays.stream(partialVersionParts).skip(1).collect(Collectors.joining());
 
         } else {
             versionPrefix = version;