diff --git a/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java b/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java
index 0a3933eef93ea92d75b1c9b10a4a06c2c1af54fd..a1e64d1a068112089571b183bbafd642d380a776 100644
--- a/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java
+++ b/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java
@@ -90,7 +90,7 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec
 					break;
 				}
 				case BeforeOperationEventRecord.CLAZZ_ID: {
-					if (buffer.remaining() >= (BeforeOperationEventRecord.BYTE_LENGTH_WITH_CLAZZ_ID - 1)) {
+					if (buffer.remaining() >= BeforeOperationEventRecord.COMPRESSED_BYTE_LENGTH) {
 						readInBeforeOperationEvent(buffer);
 					} else {
 						buffer.position(buffer.position() - 1);
@@ -100,7 +100,7 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec
 					break;
 				}
 				case AfterFailedOperationEventRecord.CLAZZ_ID: {
-					if (buffer.remaining() >= (AfterFailedOperationEventRecord.BYTE_LENGTH_WITH_CLAZZ_ID - 1)) {
+					if (buffer.remaining() >= AfterFailedOperationEventRecord.COMPRESSED_BYTE_LENGTH) {
 						readInAfterFailedOperationEvent(buffer);
 					} else {
 						buffer.position(buffer.position() - 1);
@@ -110,7 +110,7 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec
 					break;
 				}
 				case AfterOperationEventRecord.CLAZZ_ID: {
-					if (buffer.remaining() >= (AfterOperationEventRecord.BYTE_LENGTH_WITH_CLAZZ_ID - 1)) {
+					if (buffer.remaining() >= AfterOperationEventRecord.COMPRESSED_BYTE_LENGTH) {
 						readInAfterOperationEvent(buffer);
 					} else {
 						buffer.position(buffer.position() - 1);
@@ -147,7 +147,7 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec
 					break;
 				}
 				case SystemMonitoringRecord.CLAZZ_ID: {
-					if (buffer.remaining() >= (SystemMonitoringRecord.BYTE_LENGTH_WITH_CLAZZ_ID - 1)) {
+					if (buffer.remaining() >= SystemMonitoringRecord.BYTE_LENGTH) {
 						readInSystemMonitoringRecord(buffer);
 					} else {
 						buffer.position(buffer.position() - 1);
@@ -232,7 +232,8 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec
 			putInRingBuffer(new BeforeOperationEventRecord(timestamp, traceId, orderIndex,
 					operation, hostApplicationMetadata, new RuntimeStatisticInformation(timestamp)));
 		} catch (final IdNotAvailableException e) {
-			putInWaitingMessages(buffer, 1 + 8 + 8 + 4 + 4);
+			putInWaitingMessages(buffer,
+					BeforeOperationEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID);
 		}
 	}
 
@@ -251,7 +252,8 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec
 					operation, cause, hostApplicationMetadata, new RuntimeStatisticInformation(
 							timestamp)));
 		} catch (final IdNotAvailableException e) {
-			putInWaitingMessages(buffer, 1 + 8 + 8 + 4 + 4 + 4);
+			putInWaitingMessages(buffer,
+					AfterFailedOperationEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID);
 		}
 	}
 
@@ -267,7 +269,8 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec
 			putInRingBuffer(new AfterOperationEventRecord(timestamp, traceId, orderIndex,
 					operation, hostApplicationMetadata, new RuntimeStatisticInformation(timestamp)));
 		} catch (final IdNotAvailableException e) {
-			putInWaitingMessages(buffer, 1 + 8 + 8 + 4 + 4);
+			putInWaitingMessages(buffer,
+					AfterOperationEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID);
 		}
 
 	}