diff --git a/src/clj/game/core/access.clj b/src/clj/game/core/access.clj
index be353d5471..2cb8984e3f 100644
--- a/src/clj/game/core/access.clj
+++ b/src/clj/game/core/access.clj
@@ -375,10 +375,11 @@
                         ; and we're still accessing the card
                         (if (and (get-card state c)
                                  (same-card? c (:access @state)))
-                          (if (agenda? c)
-                            (access-agenda state side eid c)
-                            ;; Accessing a non-agenda
-                            (access-non-agenda state side eid c))
+                          (let [c (get-card state c)]
+                            (if (agenda? c)
+                              (access-agenda state side eid c)
+                              ;; Accessing a non-agenda
+                              (access-non-agenda state side eid c)))
                           (access-end state side eid c
                                       {:trashed (find-cid (:cid c) (get-in @state [:corp :discard]))
                                        :stolen (and (agenda? c)
diff --git a/test/clj/game/cards/operations_test.clj b/test/clj/game/cards/operations_test.clj
index 7fa10ba28a..14e9bf7a41 100644
--- a/test/clj/game/cards/operations_test.clj
+++ b/test/clj/game/cards/operations_test.clj
@@ -3129,7 +3129,21 @@
         (run-empty-server state :remote1)
         (is (changed? [(:credit (get-runner)) -8]
               (click-prompt state :runner "Pay to steal"))
-            "Paid 8c to steal 1adv Atlas"))))
+            "Paid 8c to steal 2adv Atlas"))))
+
+(deftest napd-cordon-vs-award-bait
+  ;; NAPD Cordon
+  (do-game
+      (new-game {:corp {:deck ["NAPD Cordon" "Award Bait"]}
+                 :runner {:credits 8}})
+      (play-cards state :corp ["Award Bait" "New remote"] "NAPD Cordon")
+      (take-credits state :corp)
+      (run-empty-server state :remote1)
+      (click-prompts state :corp "2" "Award Bait")
+      (is (= 2 (get-counters (get-content state :remote1 0) :advancement)) "Placed on AB")
+      (is (changed? [(:credit (get-runner)) -8]
+            (click-prompt state :runner "Pay to steal"))
+          "Paid 8c to steal 2adv Award Bait")))
 
 (deftest net-watchlist
   (doseq [[ice cost] [["Fire Wall" -12] ["Spiderweb" -9] ["Ice Wall" -3]]]