diff --git a/src/polls/entities/answer.entity.ts b/src/polls/entities/answer.entity.ts
index bf58262..4a52c71 100644
--- a/src/polls/entities/answer.entity.ts
+++ b/src/polls/entities/answer.entity.ts
@@ -1,18 +1,29 @@
-import { Entity, PrimaryGeneratedColumn, ManyToOne, Unique } from 'typeorm';
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  ManyToOne,
+  Unique,
+  JoinColumn,
+} from 'typeorm';
 import { Question } from './question.entity';
 import { User } from './user.entity';
 import { QuestionOption } from './questionOptions';
 
 @Entity()
-@Unique(['question', 'choice', 'user'])
+@Unique(['questionOption', 'user'])
 export class Answer {
   @PrimaryGeneratedColumn({})
   id: number;
 
   @ManyToOne(() => QuestionOption)
-  choice: QuestionOption;
+  @JoinColumn([
+    { name: 'questionId', referencedColumnName: 'question' },
+    { name: 'choiceId', referencedColumnName: 'choice' },
+  ])
+  questionOption: QuestionOption;
 
   @ManyToOne(() => Question, (question: Question) => question.answers)
+  @JoinColumn([{ name: 'questionId', referencedColumnName: 'id' }])
   question: Question;
 
   @ManyToOne(() => User)