diff --git a/src/main/java/NTNU/IDATT1002/models/Image.java b/src/main/java/NTNU/IDATT1002/models/Image.java
index bdad3e7d89b8a23da6bf4f82ca76f69149b3d3b2..1fdb682dafedb98fabd7cc8f25bf0660a13fbcde 100644
--- a/src/main/java/NTNU/IDATT1002/models/Image.java
+++ b/src/main/java/NTNU/IDATT1002/models/Image.java
@@ -97,7 +97,7 @@ public class Image {
   }
 
   public void addTags(ArrayList<Tag> tags) {
-    tags.addAll(tags);
+    this.tags.addAll(tags);
   }
 
   public void addTag(Tag tag){
diff --git a/src/main/java/NTNU/IDATT1002/models/Tag.java b/src/main/java/NTNU/IDATT1002/models/Tag.java
index 9b23d9bfd2b6e0fe9a767cc1d64d9be14e85dc1c..db8d20a2016c797e7b3291a2102220039b5ce64c 100644
--- a/src/main/java/NTNU/IDATT1002/models/Tag.java
+++ b/src/main/java/NTNU/IDATT1002/models/Tag.java
@@ -37,8 +37,12 @@ public class Tag {
     @ManyToMany(cascade = {CascadeType.ALL}, fetch = FetchType.LAZY)
     @JoinTable(
             name = "image_tag",
-            joinColumns = {@JoinColumn(name = "tag_id")},
-            inverseJoinColumns = {@JoinColumn(name = "image_id")}
+            joinColumns = {@JoinColumn(name = "tags_tagId",
+                    referencedColumnName = "tagId"
+            )},
+            inverseJoinColumns = {@JoinColumn(name = "image_id",
+                    referencedColumnName = "id"
+            )}
     )
     Set<Image> image = new HashSet<>();