diff --git a/Equatable.stencil b/Equatable.stencil
index f662da3..52f1e42 100644
--- a/Equatable.stencil
+++ b/Equatable.stencil
@@ -29,7 +29,7 @@ extension {{ type.name }}: Equatable {
     {{ type.accessLevel }} static func == (lhs: {{ type.name }}, rhs: {{ type.name }}) -> Bool {
         switch (lhs,rhs) {
         {% for case in type.cases %}
-            {% if case.hasAssociatedValue %}case (.{{ case.name }}(let lhs), .{{ case.name }}(let rhs)):{% else %}case (.{{ case.name }}, .{{ case.name }}):{% endif %}
+            {% if case.hasAssociatedValue %}case (.{{ case.name }}({% if case.associatedValues.count == 1 %}let lhs{% else %}{% for associated in case.associatedValues %}let {{ associated.externalName }}1{% if not forloop.last%}, {% endif %}{% endfor %}{% endif %}), .{{ case.name }}({% if case.associatedValues.count == 1 %}let rhs{% else %}{% for associated in case.associatedValues %}let {{ associated.externalName }}2{% if not forloop.last%}, {% endif %}{% endfor %}{% endif %})):{% else %}case (.{{ case.name }}, .{{ case.name }}):{% endif %}
                 {% ifnot case.hasAssociatedValue %}return true{% else %}
                 {% if case.associatedValues.count == 1 %}
 				{% if case.associatedValues.first.actualTypeName.name == "Error" %}
@@ -40,9 +40,9 @@ extension {{ type.name }}: Equatable {
                 {% else %}
                 {% for associated in case.associatedValues %}
 				{% if associated.actualTypeName.name == "Error" %}
-				guard "\(lhs.{{ associated.externalName }})" == "\(rhs.{{ associated.externalName }})" else { return false }
+				guard "\({{ associated.externalName }}1)" == "\(r{{ associated.externalName }}2)" else { return false }
 				{% else %}
-				guard lhs.{{ associated.externalName }} == rhs.{{ associated.externalName }} else { return false }
+				guard {{ associated.externalName }}1 == {{ associated.externalName }}2 else { return false }
 				{% endif %}
                 {% endfor %}
 				return true
diff --git a/Prism.stencil b/Prism.stencil
index 256afa6..311d19c 100644
--- a/Prism.stencil
+++ b/Prism.stencil
@@ -16,7 +16,7 @@ extension {{ type.name }} {
 		{% if case.hasAssociatedValue %}
 		{{ type.accessLevel }} static var {{ case.name }}: Prism<{{ type.name }},{% if case.associatedValues.count > 1 %}({% for associated in case.associatedValues %}{% call getTypeName associated %}{% if forloop.last %}{% else %}, {% endif %}{% endfor %}){% else %}{% call getTypeName case.associatedValues.first %}{% endif %}> {
 			return .init(
-				tryGet: { if case .{{ case.name }}(let value) = $0 { return value } else { return nil } },
+				tryGet: { if case .{{ case.name }}({% for associated in case.associatedValues %}let x{{ forloop.counter}}{% if not forloop.last%}, {% endif %}{% endfor %}) = $0 { return ({% for associated in case.associatedValues %}x{{ forloop.counter}}{% if not forloop.last%}, {% endif %}{% endfor %}) } else { return nil } },
 				inject: { ({% for associated in case.associatedValues %}x{{ forloop.counter}}{% if not forloop.last%}, {% endif %}{% endfor %}) in .{{ case.name }}({% for associated in case.associatedValues %}{% if associated.localName != nil %}{{ associated.localName }}:{% endif %}x{{ forloop.counter }}{% if not forloop.last%}, {% endif %}{% endfor %}) })
 		}
 		{% else %}
@@ -29,7 +29,7 @@ extension {{ type.name }} {
 		{% else %}
         {% if case.hasAssociatedValue %}
         {{ type.accessLevel }} static let {{ case.name }} = Prism<{{ type.name }},{% if case.associatedValues.count > 1 %}({% for associated in case.associatedValues %}{% call getTypeName associated %}{% if forloop.last %}{% else %}, {% endif %}{% endfor %}){% else %}{% call getTypeName case.associatedValues.first %}{% endif %}>(
-            tryGet: { if case .{{ case.name }}(let value) = $0 { return value } else { return nil } },
+            tryGet: { if case .{{ case.name }}({% for associated in case.associatedValues %}let x{{ forloop.counter}}{% if not forloop.last%}, {% endif %}{% endfor %}) = $0 { return ({% for associated in case.associatedValues %}x{{ forloop.counter}}{% if not forloop.last%}, {% endif %}{% endfor %}) } else { return nil } },
             inject: { ({% for associated in case.associatedValues %}x{{ forloop.counter}}{% if not forloop.last%}, {% endif %}{% endfor %}) in .{{ case.name }}({% for associated in case.associatedValues %}{% if associated.localName != nil %}{{ associated.localName }}:{% endif %}x{{ forloop.counter }}{% if not forloop.last%}, {% endif %}{% endfor %}) })
         {% else %}
         {{ type.accessLevel }} static let {{ case.name }} = Prism<{{ type.name }}, ()>(