diff --git a/flashcards/models.py b/flashcards/models.py
index 3a0932e..e93f331 100644
--- a/flashcards/models.py
+++ b/flashcards/models.py
@@ -351,14 +351,14 @@ class Flashcard(Model):
             user != self.author or UserFlashcard.objects.filter(flashcard=self).exclude(user=user).exists())
         if create_new:
             self.hide_by_user(user, 'replaced by new card')
-            Flashcard.push(text=new_data.get('text', self.text),
+            return Flashcard.push(text=new_data.get('text', self.text),
                            mask=new_mask,
                            material_date=new_data.get('material_date', self.material_date),
                            section=self.section,
                            previous=self,
                            author=user)
         else:
-            self.mask = FlashcardMask(new_data['mask'])
+            self.mask = new_mask
             if text_changed: self.text = new_data['text']
             if material_date_changed: self.material_date = new_data['material_date']
             self.save()
@@ -371,7 +371,7 @@ class Flashcard(Model):
             import flashcards.pushes
 
             flashcards.pushes.push_deck_event('card_fixed', self, user)
-        return self
+            return self
 
     def hide_by_user(self, user, reason=None):
 
diff --git a/flashcards/tests/test_models.py b/flashcards/tests/test_models.py
index 26666a7..f11107b 100644
--- a/flashcards/tests/test_models.py
+++ b/flashcards/tests/test_models.py
@@ -131,7 +131,8 @@ class FlashcardTests(TestCase):
         flashcard.edit(user, {})
         self.assertIsNotNone(flashcard.pk)
         UserFlashcard.objects.create(user=user2, flashcard=flashcard).save()
-        flashcard.edit(user2, {'text': 'This is the new text'})
+        flashcard = flashcard.edit(user2, {'text': 'This is the new text'})
+
         self.assertNotEqual(flashcard.pk, pk_backup)
         self.assertEqual(flashcard.text, 'This is the new text')