diff --git a/sprout/algorithm/fixed/unfold.hpp b/sprout/algorithm/fixed/unfold.hpp
index 10bd013f..871ec2b3 100644
--- a/sprout/algorithm/fixed/unfold.hpp
+++ b/sprout/algorithm/fixed/unfold.hpp
@@ -65,9 +65,7 @@ namespace sprout {
 				)
 			{
 				return size > 0
-					? size > 1
-						? sprout::fixed::detail::unfold_impl_1(cont, gen, gen(init), size, init)
-						: sprout::detail::container_complate(cont, init)
+					? sprout::fixed::detail::unfold_impl_1(cont, gen, gen(init), size)
 					: sprout::detail::container_complate(cont)
 					;
 			}
diff --git a/sprout/utility/pair.hpp b/sprout/utility/pair.hpp
index 6c0eb7d3..cfa36345 100644
--- a/sprout/utility/pair.hpp
+++ b/sprout/utility/pair.hpp
@@ -214,21 +214,20 @@ namespace sprout {
 			template<typename T1, typename T2>
 			struct get_impl<0, sprout::pair<T1, T2> > {
 			public:
-				T1& operator()(sprout::pair<T1, T2>& t) const {
+				SPROUT_CONSTEXPR T1& operator()(sprout::pair<T1, T2>& t) const {
 					return t.first;
 				}
-				T1 const& operator()(sprout::pair<T1, T2> const& t) const {
+				SPROUT_CONSTEXPR T1 const& operator()(sprout::pair<T1, T2> const& t) const {
 					return t.first;
 				}
 			};
 			template<typename T1, typename T2>
 			struct get_impl<1, sprout::pair<T1, T2> > {
 			public:
-			public:
-				T2& operator()(sprout::pair<T1, T2>& t) const {
+				SPROUT_CONSTEXPR T2& operator()(sprout::pair<T1, T2>& t) const {
 					return t.second;
 				}
-				T2 const& operator()(sprout::pair<T1, T2> const& t) const {
+				SPROUT_CONSTEXPR T2 const& operator()(sprout::pair<T1, T2> const& t) const {
 					return t.second;
 				}
 			};
diff --git a/testspr/tools.hpp b/testspr/tools.hpp
index e7b5ca59..94fd261a 100644
--- a/testspr/tools.hpp
+++ b/testspr/tools.hpp
@@ -187,10 +187,10 @@ namespace testspr {
 			T val;
 		public:
 			SPROUT_CONSTEXPR T const& generated_value() const { return val; }
-			SPROUT_CONSTEXPR T const& next_generator() const { return val; }
+			SPROUT_CONSTEXPR T next_generator() const { return val + 1; }
 		};
 	public:
-		SPROUT_CONSTEXPR result operator()(T const& val) const { return result{val + 1}; }
+		SPROUT_CONSTEXPR result operator()(T const& val) const { return result{val}; }
 	};
 
 	//