diff --git a/src/core/GameKeyHandler.ttslua b/src/core/GameKeyHandler.ttslua
index 1c39f496..daaa243c 100644
--- a/src/core/GameKeyHandler.ttslua
+++ b/src/core/GameKeyHandler.ttslua
@@ -108,8 +108,13 @@ function takeClueFromLocation(playerColor, hoveredObject)
     cardName = "nameless card"
   end
 
-  clue.setPositionSmooth(pos)
-  clue.setRotation(rot)
+  -- check if found clue is a stack or single token
+  if clue.getQuantity() > 1 then
+    clue.takeObject({position = pos, rotation = rot})
+  else
+    clue.setPositionSmooth(pos)
+    clue.setRotation(rot)
+  end
 
   if cardName then
     broadcastToAll(playerName .. " took one clue from " .. cardName .. ".", playerColor)
@@ -138,4 +143,4 @@ function searchOnObj(obj)
     size         = obj.getBounds().size,
     origin       = obj.getPosition()
   })
-end
\ No newline at end of file
+end