diff --git a/bin/classes/com/felhr/usbserial/UsbSerialDevice$WorkerThread.class b/bin/classes/com/felhr/usbserial/UsbSerialDevice$WorkerThread.class
index 1ad0819..e56cc5c 100644
Binary files a/bin/classes/com/felhr/usbserial/UsbSerialDevice$WorkerThread.class and b/bin/classes/com/felhr/usbserial/UsbSerialDevice$WorkerThread.class differ
diff --git a/bin/classes/com/felhr/usbserial/UsbSerialDevice$WriteThread.class b/bin/classes/com/felhr/usbserial/UsbSerialDevice$WriteThread.class
index 1c03413..531945c 100644
Binary files a/bin/classes/com/felhr/usbserial/UsbSerialDevice$WriteThread.class and b/bin/classes/com/felhr/usbserial/UsbSerialDevice$WriteThread.class differ
diff --git a/bin/classes/com/felhr/usbserial/UsbSerialDevice.class b/bin/classes/com/felhr/usbserial/UsbSerialDevice.class
index 33b862b..d4918b9 100644
Binary files a/bin/classes/com/felhr/usbserial/UsbSerialDevice.class and b/bin/classes/com/felhr/usbserial/UsbSerialDevice.class differ
diff --git a/bin/usbserial.jar b/bin/usbserial.jar
index 2e0d6d1..4aabde6 100644
Binary files a/bin/usbserial.jar and b/bin/usbserial.jar differ
diff --git a/src/com/felhr/usbserial/UsbSerialDevice.java b/src/com/felhr/usbserial/UsbSerialDevice.java
index df113f9..966dacd 100644
--- a/src/com/felhr/usbserial/UsbSerialDevice.java
+++ b/src/com/felhr/usbserial/UsbSerialDevice.java
@@ -120,12 +120,15 @@ public abstract class UsbSerialDevice implements UsbSerialInterface
 					byte[] data = serialBuffer.getDataReceived();
 					// FTDI devices reserves two first bytes of an IN endpoint with info about
 					// modem and Line.
-					if(isFTDIDevice() && data.length > 2)
+					if(isFTDIDevice())
 					{
-						data = FTDISerialDevice.FTDIUtilities.adaptArray(data);
-						// Clear buffer, execute the callback 
-						serialBuffer.clearReadBuffer();
-						onReceivedData(data);
+						if(data.length > 2)
+						{
+							data = FTDISerialDevice.FTDIUtilities.adaptArray(data);
+							// Clear buffer, execute the callback 
+							serialBuffer.clearReadBuffer();
+							onReceivedData(data);
+						}
 					}else
 					{
 						// Clear buffer, execute the callback