diff --git a/src/containers/pimap.h b/src/containers/pimap.h
index f4f1640f..a373b5a2 100644
--- a/src/containers/pimap.h
+++ b/src/containers/pimap.h
@@ -114,8 +114,8 @@ public:
 		ssize_t pos;
 	public:
 		const_iterator(): parent(0), pos(0) {}
-		const PIMap<Key, T>::value_type operator *() const {return parent->_pair(pos);}
-		const PIMap<Key, T>::value_type* operator ->() const {cval = parent->_pair(pos); return &cval;}
+		const value_type operator *() const {return parent->_pair(pos);}
+		const value_type* operator ->() const {cval = parent->_pair(pos); return &cval;}
 		void operator ++() {++pos;}
 		void operator ++(int) {++pos;}
 		void operator --() {--pos;}
@@ -133,8 +133,8 @@ public:
 		ssize_t pos;
 	public:
 		const_reverse_iterator(): parent(0), pos(0) {}
-		const PIMap<Key, T>::value_type operator *() const {return parent->_pair(pos);}
-		const PIMap<Key, T>::value_type* operator ->() const {cval = parent->_pair(pos); return &cval;}
+		const value_type operator *() const {return parent->_pair(pos);}
+		const value_type* operator ->() const {cval = parent->_pair(pos); return &cval;}
 		void operator ++() {--pos;}
 		void operator ++(int) {--pos;}
 		void operator --() {++pos;}