diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java b/src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java
index 5033be6..491e083 100644
--- a/src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java
+++ b/src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java
@@ -33,7 +33,7 @@ public class ResultSet {
      * @return The procedure id if any
      */
     public Integer getProcedureId() {
-        var procedureId = this.getInteger("procedure.id");
+        var procedureId = this.getInteger("id");
         if (procedureId == null) {
             throw new DataAccessException("No procedure id found");
         }
@@ -46,7 +46,7 @@ public class ResultSet {
      * @return The procedure id if any
      */
     public Integer getDiseaseId() {
-        var diseaseId = this.getInteger("erkrankung.id");
+        var diseaseId = this.getInteger("id");
         if (diseaseId == null) {
             throw new DataAccessException("No disease id found");
         }
diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/AbstractDataCatalogue.java b/src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/AbstractDataCatalogue.java
index 6f3ca36..255829f 100644
--- a/src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/AbstractDataCatalogue.java
+++ b/src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/AbstractDataCatalogue.java
@@ -56,7 +56,7 @@ public abstract class AbstractDataCatalogue implements DataCatalogue {
     public List<ResultSet> getDiseases(int procedureId) {
         return this.jdbcTemplate.queryForList(
                         String.format(
-                                "SELECT * FROM erkrankung_prozedur JOIN erkrankung ON (erkrankung.id = erkrankung_prozedur.erkrankung.id) WHERE erkrankung_prozedur.prozedur_id = ?",
+                                "SELECT * FROM erkrankung_prozedur JOIN erkrankung ON (erkrankung.id = erkrankung_prozedur.erkrankung_id) WHERE erkrankung_prozedur.prozedur_id = ?",
                                 getTableName(),
                                 getTableName()
                         ),