diff --git a/intrinsics/tags.go b/intrinsics/tags.go
index dcf50472cb..151f99983a 100644
--- a/intrinsics/tags.go
+++ b/intrinsics/tags.go
@@ -24,7 +24,7 @@ func (t *tagUnmarshalerType) UnmarshalYAMLTag(tag string, fieldValue reflect.Val
 
 	tag = prefix + tag
 
-	output := reflect.ValueOf(make(map[string]interface{}))
+	output := reflect.ValueOf(make(map[interface{}]interface{}))
 	key := reflect.ValueOf(tag)
 
 	output.SetMapIndex(key, fieldValue)
diff --git a/test/yaml/yaml-intrinsic-tags.yaml b/test/yaml/yaml-intrinsic-tags.yaml
index acf724ad24..a2cf75a06a 100644
--- a/test/yaml/yaml-intrinsic-tags.yaml
+++ b/test/yaml/yaml-intrinsic-tags.yaml
@@ -11,3 +11,5 @@ Resources:
     Properties:
       Runtime: !Sub "${ParamNotExists}4.3"
       Timeout: !Ref TimeoutParam
+      FunctionName: !Base64
+        Ref: AWS::Region