diff --git a/Deck.gd b/Deck.gd
index a4a9a88..ee85f6e 100644
--- a/Deck.gd
+++ b/Deck.gd
@@ -82,4 +82,5 @@ func draw_card() -> CardValue:
 		return null
 	var card_id = card_order[next_to_draw]
 	next_to_draw += 1
-	return card_id
+	var card = cards[card_id]
+	return card
diff --git a/HanafudaCard.gd b/HanafudaCard.gd
index 63a721d..28255eb 100644
--- a/HanafudaCard.gd
+++ b/HanafudaCard.gd
@@ -8,7 +8,8 @@ export var revealed: bool = true setget reveal
 export(Enums.Month) var month: int setget _set_card_month
 export(Enums.Type) var type: int setget _set_card_type
 
-onready var value = CardValue.new(Enums.Month.JANUARY, Enums.Type.LIGHT)
+var value: CardValue = CardValue.new(Enums.Month.JANUARY, Enums.Type.LIGHT)
+
 onready var _is_ready := true
 
 # Called when the node enters the scene tree for the first time.