diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java b/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java
index fba7e99..e99e729 100644
--- a/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java
+++ b/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java
@@ -158,12 +158,12 @@ public class Conference implements Serializable{
 		this.dateEnd = dateEnd;
 	}
 
-	@OneToMany(targetEntity=Article.class,mappedBy="articles")
+	@OneToMany(targetEntity=Article.class,mappedBy="conference")
 	public void setArticles(List<Article> articles) {
 		this.articles = articles;
 	}
 	
-	@OneToMany(targetEntity=Article.class,mappedBy="articles")
+	@OneToMany(targetEntity=Article.class,mappedBy="conference")
 	public List<Article> getArticles() {
 		return articles;
 	}