diff --git a/Audio/Chain/BufferChain.m b/Audio/Chain/BufferChain.m
index 2c55011ad..1ce5a17d4 100644
--- a/Audio/Chain/BufferChain.m
+++ b/Audio/Chain/BufferChain.m
@@ -122,6 +122,7 @@
 
 - (void)dealloc
 {
+    [inputNode setShouldContinue:NO];
     [[inputNode exitAtTheEndOfTheStream] signal];
     [[inputNode semaphore] signal];
     [[inputNode exitAtTheEndOfTheStream] wait]; // wait for decoder to be closed (see InputNode's -(void)process )
@@ -198,8 +199,8 @@
 
 - (BOOL)isRunning
 {
-    InputNode *theInputNode = [self inputNode];
-    if (nil != theInputNode && [theInputNode shouldContinue] && ![theInputNode endOfStream])
+    InputNode *node = [self inputNode];
+    if (nil != node && [node shouldContinue] && ![node endOfStream])
     {
         return YES;
     }
diff --git a/Audio/Chain/InputNode.m b/Audio/Chain/InputNode.m
index f6eeba767..e40d7e031 100644
--- a/Audio/Chain/InputNode.m
+++ b/Audio/Chain/InputNode.m
@@ -101,7 +101,7 @@
 	if ([keyPath isEqual:@"properties"]) {
 		//Setup converter!
 		//Inform something of properties change
-		//Disable support until it is properly implimented.
+		//Disable support until it is properly implemented.
 		//[controller inputFormatDidChange: propertiesToASBD([decoder properties])];
 	}
 	else if ([keyPath isEqual:@"metadata"]) {