diff --git a/NeuralAudio/WaveNet.h b/NeuralAudio/WaveNet.h
index 5f0814b..5e52f46 100644
--- a/NeuralAudio/WaveNet.h
+++ b/NeuralAudio/WaveNet.h
@@ -122,6 +122,7 @@ namespace NeuralAudio
 		DenseLayerT<ConditionSize, Channels, false> inputMixin;
 		DenseLayerT<Channels, Channels, true> oneByOne;
 		Eigen::Matrix<float, Channels, WAVENET_MAX_NUM_FRAMES> state;
+		bool isLast;
 
 	public:
 		static constexpr auto ReceptiveFieldSize = (KernelSize - 1) * Dilation;
@@ -136,11 +137,17 @@ namespace NeuralAudio
 		//Eigen::Matrix<float, Channels, -1> layerBuffer;
 		size_t bufferStart;
 
-		WaveNetLayerT()
+		WaveNetLayerT() :
+			isLast(false)
 		{
 			state.setZero();
 		}
 
+		void SetLast()
+		{
+			isLast = true;
+		}
+
 		void AllocBuffer(int allocNum)
 		{
 			long size = BufferSize;
@@ -225,9 +232,12 @@ namespace NeuralAudio
 
 			const_cast<Eigen::MatrixBase<Derived2>&>(headInput).noalias() += block.topRows(Channels);
 
-			oneByOne.Process(block.topRows(Channels), const_cast<Eigen::MatrixBase<Derived3>&>(output).middleCols(outputStart, numFrames));
+			if (!isLast)
+			{
+				oneByOne.Process(block.topRows(Channels), const_cast<Eigen::MatrixBase<Derived3>&>(output).middleCols(outputStart, numFrames));
 
-			const_cast<Eigen::MatrixBase<Derived3>&>(output).middleCols(outputStart, numFrames).noalias() += layerBuffer.middleCols(bufferStart, numFrames);
+				const_cast<Eigen::MatrixBase<Derived3>&>(output).middleCols(outputStart, numFrames).noalias() += layerBuffer.middleCols(bufferStart, numFrames);
+			}
 		}
 	};
 
@@ -280,6 +290,11 @@ namespace NeuralAudio
 			return allocNum;
 		}
 
+		void SetLast()
+		{
+			std::get<lastLayer>(layers).SetLast();
+		}
+
 		void SetWeights(std::vector<float>::iterator& weights)
 		{
 			rechannel.SetWeights(weights);
@@ -350,6 +365,7 @@ namespace NeuralAudio
 					allocNum = std::get<layerIndex>(layerArrays).AllocBuffers(allocNum);
 				});
 
+			std::get<sizeof...(LayerArrays)-1>(layerArrays).SetLast();
 		}
 
 		void SetWeights(std::vector<float> weights)
@@ -431,4 +447,4 @@ namespace NeuralAudio
 		Eigen::Matrix<float, headLayerChannels, WAVENET_MAX_NUM_FRAMES> headArray;
 		float headScale;
 	};
-}
\ No newline at end of file
+}