diff --git a/lib/buffer_concat_polyfill.js b/lib/buffer_concat_polyfill.js
index <HASH>..<HASH> 100644
--- a/lib/buffer_concat_polyfill.js
+++ b/lib/buffer_concat_polyfill.js
@@ -17,10 +17,10 @@ function polyfill(list, totalLength) {
         i = 0;
 
     // @see http://nodejs.org/api/buffer.html#buffer_class_method_buffer_concat_list_totallength
-    if (list.length === 0 || size === 0) {
-        return new Buffer(0);
-    } else if (list.length === 1) {
+    if (list.length === 1) {
         return list[0];
+    } else if (list.length === 0 || size === 0) {
+        return new Buffer(0);
     } else {
         result = new Buffer(size);
fix buffer concat polyfill for the case when the list contains one zero length buffer