diff --git a/cbor/value.go b/cbor/value.go
index 6c855b0c..78f2d680 100644
--- a/cbor/value.go
+++ b/cbor/value.go
@@ -239,6 +239,7 @@ func generateAstJson(obj interface{}) ([]byte, error) {
 }
 
 type Constructor struct {
+	DecodeStoreCbor
 	constructor uint
 	value       *Value
 }
@@ -268,6 +269,8 @@ func (c Constructor) FieldsCbor() []byte {
 }
 
 func (c *Constructor) UnmarshalCBOR(data []byte) error {
+	// Save original CBOR
+	c.SetCbor(data)
 	// Parse as a raw tag to get number and nested CBOR data
 	tmpTag := RawTag{}
 	if _, err := Decode(data, &tmpTag); err != nil {