diff --git a/lib/pc_bytes.c b/lib/pc_bytes.c
index 150ed55..3c91f2a 100644
--- a/lib/pc_bytes.c
+++ b/lib/pc_bytes.c
@@ -942,12 +942,7 @@ pc_bytes_sigbits_decode_8(const PCBYTES pcb)
 		int shift = bit - nbits;
 		uint8_t val = *bytes_ptr;
 		/* The unique part is all in this word */
-		if ( shift == 0 )
-		{
-			obytes[i] = val;
-			++bytes_ptr;
-		}
-		else if ( shift > 0 )
+		if ( shift >= 0 )
 		{
 			/* Push unique part to bottom of word */
 			val >>= shift;
@@ -1012,12 +1007,7 @@ pc_bytes_sigbits_decode_16(const PCBYTES pcb)
 	{
 		int shift = bit - nbits;
 		uint16_t val = *bytes_ptr;
-		if ( shift == 0 )
-		{
-			obytes[i] = val;
-			++bytes_ptr;
-		}
-		else if ( shift > 0 )
+		if ( shift >= 0 )
 		{
 			val >>= shift;
 			val &= mask;
@@ -1076,12 +1066,7 @@ pc_bytes_sigbits_decode_32(const PCBYTES pcb)
 	{
 		int shift = bit - nbits;
 		uint32_t val = *bytes_ptr;
-		if ( shift == 0 )
-		{
-			obytes[i] = val;
-			++bytes_ptr;
-		}
-		else if ( shift > 0 )
+		if ( shift >= 0 )
 		{
 			val >>= shift;
 			val &= mask;
@@ -1141,12 +1126,7 @@ pc_bytes_sigbits_decode_64(const PCBYTES pcb)
 	{
 		int shift = bit - nbits;
 		uint64_t val = *bytes_ptr;
-		if ( shift == 0 )
-		{
-			obytes[i] = val;
-			++bytes_ptr;
-		}
-		else if ( shift > 0 )
+		if ( shift >= 0 )
 		{
 			val >>= shift;
 			val &= mask;