diff --git a/NXDNFACCH1.cpp b/NXDNFACCH1.cpp
index ca2a9fc..54aceaa 100644
--- a/NXDNFACCH1.cpp
+++ b/NXDNFACCH1.cpp
@@ -22,7 +22,6 @@
 #include "NXDNDefines.h"
 #include "NXDNCRC.h"
 #include "Utils.h"
-#include "Log.h"
 
 #include <cstdio>
 #include <cassert>
diff --git a/NXDNLayer3.cpp b/NXDNLayer3.cpp
index dce3d17..b8a60e8 100644
--- a/NXDNLayer3.cpp
+++ b/NXDNLayer3.cpp
@@ -18,7 +18,6 @@
 
 #include "NXDNDefines.h"
 #include "NXDNLayer3.h"
-#include "Log.h"
 
 #include <cstdio>
 #include <cassert>
@@ -53,8 +52,8 @@ void CNXDNLayer3::decode(const unsigned char* bytes, unsigned int length, unsign
 	assert(bytes != NULL);
 
 	for (unsigned int i = 0U; i < length; i++, offset++) {
-		bool b = READ_BIT1(bytes, offset);
-		WRITE_BIT1(m_data, i, b);
+		bool b = READ_BIT1(bytes, i);
+		WRITE_BIT1(m_data, offset, b);
 	}
 }
 
diff --git a/NXDNSACCH.cpp b/NXDNSACCH.cpp
index b060fa4..1e490c2 100755
--- a/NXDNSACCH.cpp
+++ b/NXDNSACCH.cpp
@@ -22,7 +22,6 @@
 #include "NXDNDefines.h"
 #include "NXDNCRC.h"
 #include "Utils.h"
-#include "Log.h"
 
 #include <cstdio>
 #include <cassert>
diff --git a/NXDNUDCH.cpp b/NXDNUDCH.cpp
index c4ead27..a0d8dbf 100644
--- a/NXDNUDCH.cpp
+++ b/NXDNUDCH.cpp
@@ -22,7 +22,6 @@
 #include "NXDNDefines.h"
 #include "NXDNCRC.h"
 #include "Utils.h"
-#include "Log.h"
 
 #include <cstdio>
 #include <cassert>