--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/DefaultBedHeights.java	Fri May 25 10:47:18 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/DefaultBedHeights.java	Fri May 25 10:47:38 2018 +0200
@@ -103,22 +103,17 @@
         }
     }
 
-    private static List<BedHeight> loadBedHeightsByName(final River shouldBeRiver, final Collection<String> bedHeightNames, final Calculation problems) {
+    private static List<BedHeight> loadBedHeightsByName(final River river, final Collection<String> bedHeightNames, final Calculation problems) {
 
         final List<BedHeight> bedHeights = new ArrayList<>(bedHeightNames.size());
 
         for (final String name : bedHeightNames) {
             try {
-                final BedHeight bedHeight = BedHeight.getBedHeightByDescription(name);
+                final BedHeight bedHeight = BedHeight.getBedHeightByDescription(river, name);
                 if (bedHeight == null)
-                    problems.addProblem("sinfo.bedheightsfinder.missingdescription", name);
-                else {
-                    final River river = bedHeight.getRiver();
-                    if (!shouldBeRiver.getId().equals(river.getId()))
-                        problems.addProblem("sinfo.bedheightsfinder.wrongriver", name, shouldBeRiver.getName());
-                    else
-                        bedHeights.add(bedHeight);
-                }
+                    problems.addProblem("sinfo.bedheightsfinder.missingdescription", river.getName(), name);
+                else
+                    bedHeights.add(bedHeight);
             }
             catch (final Exception e) {
                 e.printStackTrace();