diff --git a/libs/random/include/psemek/random/uniform.hpp b/libs/random/include/psemek/random/uniform.hpp
index 73456b6f..465069ac 100644
--- a/libs/random/include/psemek/random/uniform.hpp
+++ b/libs/random/include/psemek/random/uniform.hpp
@@ -56,9 +56,9 @@ namespace psemek::random
 	}
 
 	template <typename RNG, typename Container>
-	auto & uniform_from(RNG && rng, Container & container)
+	decltype(auto) uniform_from(RNG && rng, Container && container)
 	{
-		if (container.empty())
+		if (container.size() == 0)
 			throw std::runtime_error("cannot sample from empty container");
 		return *std::next(container.begin(), uniform<std::size_t>(rng, 0, container.size() - 1));
 	}