diff --git a/Source/VAPlugin/Private/VASignalBufferManager.cpp b/Source/VAPlugin/Private/VASignalBufferManager.cpp
index 4db7df97efd31e33e90be3214ca7e5d9d3bb66f4..6562327674e8d600e2e6729b3c13b44025790591 100644
--- a/Source/VAPlugin/Private/VASignalBufferManager.cpp
+++ b/Source/VAPlugin/Private/VASignalBufferManager.cpp
@@ -22,21 +22,16 @@ FVASignalBufferManager::~FVASignalBufferManager()
 FVASignalBuffer* FVASignalBufferManager::GetBufferByFileName(const FString FileName)
 {
 	// Find already existing Buffer
-	if (!Buffers.Num())
+	for (auto EntryBuffer : Buffers)
 	{
-		for (auto EntryBuffer : Buffers)
+		if (EntryBuffer.Get()->GetFileName() == FileName)
 		{
-			if (EntryBuffer.Get()->GetFileName() == FileName)
-			{
-				FVAUtils::LogStuff("[FVASignalBufferManager::getBufferByFileName()]: Buffer from file " + 
-					FileName + " was found!", false);
-
-				return EntryBuffer.Get();
-			}
+			FVAUtils::LogStuff("[FVASignalBufferManager::getBufferByFileName()]: Buffer from file " + 
+				FileName + " was found!", false);
+			return EntryBuffer.Get();
 		}
 	}
 
-
 	FVAUtils::LogStuff("[FVASignalBufferManager::getBufferByFileName()]: Buffer from file " + 
 		FileName + " cannot be found! Creating one now...", false);