diff --git a/include/libtorrent/piece_picker.hpp b/include/libtorrent/piece_picker.hpp
index 9ec886eb4..d1accbd09 100644
--- a/include/libtorrent/piece_picker.hpp
+++ b/include/libtorrent/piece_picker.hpp
@@ -836,7 +836,7 @@ namespace libtorrent
 #ifdef TORRENT_OPTIMIZE_MEMORY_USAGE
 		enum { max_pieces = piece_pos::we_have_index - 1 };
 #else
-		enum { max_pieces = (std::numeric_limits<int>::max)() - 1 };
+		enum { max_pieces = INT_MAX - 1 };
 #endif
 
 	};
diff --git a/simulation/libsimulator b/simulation/libsimulator
index a5479665a..fa1e83614 160000
--- a/simulation/libsimulator
+++ b/simulation/libsimulator
@@ -1 +1 @@
-Subproject commit a5479665ad3b2366721a166dcda527b987825f86
+Subproject commit fa1e83614ca96b4802a4c6cea9488a93111be86d