diff --git a/src/lazy_bdecode.cpp b/src/lazy_bdecode.cpp
index 44506cf5a..6c469b64a 100644
--- a/src/lazy_bdecode.cpp
+++ b/src/lazy_bdecode.cpp
@@ -395,11 +395,12 @@ namespace libtorrent
 			{
 				os << "[";
 				bool one_liner = (e.list_size() == 0
-					|| e.list_at(0)->type() == lazy_entry::int_t
+					|| (e.list_at(0)->type() == lazy_entry::int_t
+						&& e.list_size() < 20)
 					|| (e.list_at(0)->type() == lazy_entry::string_t
 						&& (e.list_at(0)->string_length() < 10
-							|| e.list_size() < 2)))
-					&& e.list_size() < 5;
+							|| e.list_size() < 2))
+						&& e.list_size() < 5);
 				if (!one_liner) os << "\n";
 				for (int i = 0; i < e.list_size(); ++i)
 				{