diff --git a/contributed templates/Nikita Zhuk/ponso/templates/machine.m.motemplate b/contributed templates/Nikita Zhuk/ponso/templates/machine.m.motemplate
index 0c1db203..b5061694 100755
--- a/contributed templates/Nikita Zhuk/ponso/templates/machine.m.motemplate	
+++ b/contributed templates/Nikita Zhuk/ponso/templates/machine.m.motemplate	
@@ -184,10 +184,10 @@
 {
     <$if Relationship.inverseRelationship$><$if Relationship.inverseRelationship.isToMany$>if ((<$Relationship.name$>_ == nil || ![<$Relationship.name$>_ isEqual: <$Relationship.name$>]) && setInverse == YES) {
         [<$Relationship.name$> remove<$Relationship.inverseRelationship.name.initialCapitalString$>Object: (<$managedObjectClassName$>*)self settingInverse: NO];
-    }<$else$>if (<$Relationship.name$>_ == nil) {
+    }<$else$>if (<$Relationship.name$>_ == nil && setInverse == YES) {
         [<$Relationship.name$> set<$Relationship.inverseRelationship.name.initialCapitalString$>: nil settingInverse: NO];
     }
-    <$endif$><$if Relationship.isTransient$><$Relationship.name$> = <$Relationship.name$>_;<$else$>if (<$Relationship.name$> != <$Relationship.name$>_) {
+    <$endif$><$endif$><$if Relationship.isTransient$><$Relationship.name$> = <$Relationship.name$>_;<$else$>if (<$Relationship.name$> != <$Relationship.name$>_) {
         [<$Relationship.name$> release];
         <$Relationship.name$> = [<$Relationship.name$>_ retain];
     }<$endif$>
@@ -214,8 +214,8 @@
 {
 	<$foreach Attribute noninheritedAttributes do$><$if Attribute.hasDefinedAttributeType$>self.<$Attribute.name$> = nil;
 	<$endif$><$endforeach do$>
-	<$foreach Relationship noninheritedRelationships do$>self.<$Relationship.name$> = nil;
-	<$endforeach do$>
+	<$foreach Relationship noninheritedRelationships do$><$if ! Relationship.isTransient$>self.<$Relationship.name$> = nil;
+	<$endif$><$endforeach do$>
 	[super dealloc];
 }