diff --git a/pom.xml b/pom.xml
index 1a071c2..611fd0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.srsoftware</groupId>
 	<artifactId>web4rail</artifactId>
-	<version>1.5.0</version>
+	<version>1.5.1</version>
 	<name>Web4Rail</name>
 	<packaging>jar</packaging>
 	<description>Java Model Railway Control</description>
diff --git a/src/main/java/de/srsoftware/web4rail/functions/FunctionList.java b/src/main/java/de/srsoftware/web4rail/functions/FunctionList.java
index f8e9bef..483868e 100644
--- a/src/main/java/de/srsoftware/web4rail/functions/FunctionList.java
+++ b/src/main/java/de/srsoftware/web4rail/functions/FunctionList.java
@@ -40,8 +40,8 @@ public class FunctionList extends HashSet<Function> implements Constants{
 
 	public FunctionList toggle(String name) {
 		boolean enabled = !enabledFunctions.remove(name);
-		if (enabled) enabledFunctions.add(name);
-		stream().filter(fun -> name.equals(fun.name())).forEach(fun -> fun.setState(enabled));
+		if (enabled) enabledFunctions.add(name);		
+		for (Function fun : with(name)) fun.setState(enabled);
 		return this;
 	}
 
diff --git a/src/main/java/de/srsoftware/web4rail/moving/Train.java b/src/main/java/de/srsoftware/web4rail/moving/Train.java
index a73cf07..7b745ab 100644
--- a/src/main/java/de/srsoftware/web4rail/moving/Train.java
+++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java
@@ -164,6 +164,7 @@ public class Train extends BaseClass implements Comparable<Train> {
 		if (isSet(car)) {
 			cars.add(car);
 			car.train(this);
+			updateEnds();
 		}
 		return this;		
 	}