diff --git a/src/containers/pimap.h b/src/containers/pimap.h
index 87c8fb99..57142775 100644
--- a/src/containers/pimap.h
+++ b/src/containers/pimap.h
@@ -119,6 +119,8 @@ public:
 		const_iterator(): parent(0), pos(0) {}
 		const value_type operator *() const {return parent->_pair(pos);}
 		const value_type* operator ->() const {cval = parent->_pair(pos); return &cval;}
+		const Key & key() const {return const_cast<PIMap<Key, T> * >(parent)->_key(pos);}
+		const T & value() const {return const_cast<PIMap<Key, T> * >(parent)->_value(pos);}
 		void operator ++() {++pos;}
 		void operator ++(int) {++pos;}
 		void operator --() {--pos;}