diff --git a/link.sh b/link.sh
index 1e85c1f..9551068 100755
--- a/link.sh
+++ b/link.sh
@@ -1,2 +1,2 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 ln -s $(pwd)/plugin ~/.local/share/Anki2/addons21/AnkiConnectDev
diff --git a/link_mac.sh b/link_mac.sh
new file mode 100755
index 0000000..316966e
--- /dev/null
+++ b/link_mac.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+ln -s $(pwd)/plugin ~/Library/Application\ Support/Anki2/addons21/AnkiConnectDev
diff --git a/plugin/__init__.py b/plugin/__init__.py
index a34788c..a3e15e7 100644
--- a/plugin/__init__.py
+++ b/plugin/__init__.py
@@ -796,8 +796,8 @@ class AnkiConnect:
                     'cardId': card.id,
                     'fields': fields,
                     'fieldOrder': card.ord,
-                    'question': card._getQA()['q'],
-                    'answer': card._getQA()['a'],
+                    'question': card.question(),
+                    'answer': card.answer(),
                     'modelName': model['name'],
                     'deckName': self.deckNameFromId(card.did),
                     'css': model['css'],
@@ -1051,8 +1051,8 @@ class AnkiConnect:
                 'cardId': card.id,
                 'fields': fields,
                 'fieldOrder': card.ord,
-                'question': card._getQA()['q'],
-                'answer': card._getQA()['a'],
+                'question': card.question(),
+                'answer': card.answer(),
                 'buttons': [b[0] for b in buttonList],
                 'nextReviews': [reviewer.mw.col.sched.nextIvlStr(reviewer.card, b[0], True) for b in buttonList],
                 'modelName': model['name'],