Index: src/Common/Iterate.hpp
===================================================================
--- src/Common/Iterate.hpp	(revision c6b4432f5c6c6679b981f5a6bded51ad30ac00d9)
+++ src/Common/Iterate.hpp	(revision 45a091b00fd95491b28961bb07e3975caedbe601)
@@ -58,6 +58,6 @@
 	template<typename val_t>
 	struct value_t {
+		size_t idx;
 		val_t & val;
-		size_t idx;
 	};
 
@@ -69,5 +69,5 @@
 		iterator_t( iter_t _it, size_t _idx ) : it(_it), idx(_idx) {}
 
-		value_t<val_t> operator*() const { return value_t<val_t>{ *it, idx }; }
+		value_t<val_t> operator*() const { return value_t<val_t>{ idx, *it }; }
 
 		bool operator==(const iterator_t & o) const { return o.it == it; }