diff --git a/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java b/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java
index 43dd6f491..836c30dac 100644
--- a/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java
+++ b/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java
@@ -160,7 +160,7 @@ public interface CacheId {
 	 * Compares strings numerical.
 	 */
 	public static final MixedStringComparator NUMERIC_COMPARATOR = new MixedStringComparator(
-			"(?<numberPrefix>-)?(?<numberN>[0-9]+)(,(?<numberD>[0-9]+))?");
+			"(?<numberPrefix>-)?(?<numberN>[0-9]+)(.(?<numberD>[0-9]+))?");
 
 	/**
 	 * The id of the attachment viewer part.
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend
index f3bc4a10f..dcca7d5c1 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend
+++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend
@@ -4,7 +4,7 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v2.0 which is available at
  * https://www.eclipse.org/legal/epl-2.0.
- *
+ * 
  * SPDX-License-Identifier: EPL-2.0
  * 
  */
@@ -367,7 +367,7 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
 				ITERABLE_FILLING_SEPARATOR
 			)
 
-			// O: Sszs.ETCS_Gefahrpunkt.Bezeichnung:
+			// O: Sszs.ETCS_Gefahrpunkt.Bezeichnung
 			fillConditional(
 				row,
 				cols.getColumn(Gefahrpunkt_Bezeichnung),
@@ -396,7 +396,10 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
 					[ETCSGefahrpunktabstandAbweichend?.wert?.toTableDecimal]
 				),
 				new Case<ETCS_Signal>(
-					[IDETCSGefahrpunkt2?.value !== null],
+					[
+						IDETCSGefahrpunkt2?.value !== null &&
+							IDETCSGefahrpunkt?.value !== null
+					],
 					[
 						row.addTopologicalCell(
 							cols.getColumn(Abstand_vom_Signal))
@@ -406,17 +409,22 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
 						val distanceToETCSGefahrpunkt2 = distanceToSignal(
 							IDETCSGefahrpunkt2?.value?.IDMarkanteStelle?.value).
 							toTableDecimal
-						return '''«distanceToETCSGefahrpunkt»(«distanceToETCSGefahrpunkt2»)'''
+						return '''«distanceToETCSGefahrpunkt» («distanceToETCSGefahrpunkt2»)'''
+
 					]
 				),
 				new Case<ETCS_Signal>(
-					[IDETCSGefahrpunkt2?.value === null],
+					[
+						IDETCSGefahrpunkt2?.value === null &&
+							IDETCSGefahrpunkt?.value !== null
+					],
 					[
 						row.addTopologicalCell(
 							cols.getColumn(Abstand_vom_Signal))
 						distanceToSignal(
 							IDETCSGefahrpunkt?.value?.IDMarkanteStelle?.value).
 							toTableDecimal
+
 					]
 				)
 			)
@@ -503,9 +511,9 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
 						return ""
 					}
 					val distanceValue = distance.get
-					return distanceValue <= 5 ||
-						distanceValue >= -3 ? "0" : AgateRounding.roundUp(
-						distanceValue).toString
+					return distanceValue <= 5 || distanceValue >= -3
+						? "0"
+						: AgateRounding.roundUp(distanceValue).toString
 				]
 			)
 
@@ -775,9 +783,8 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
 			if (distances.compareTo(BigDecimal.ZERO) == 0) {
 				return fma -> 0.0
 			}
-			return topGraph.isInWirkrichtungOfSignal(signal, fma)
-				? fma -> distances.doubleValue
-				: fma -> -distances.doubleValue
+			return topGraph.isInWirkrichtungOfSignal(signal, fma) ? fma ->
+				distances.doubleValue : fma -> -distances.doubleValue
 		].filterNull
 		if (distanceToSignal.empty) {
 			return Optional.empty