diff --git a/include/mapnik/feature_kv_iterator.hpp b/include/mapnik/feature_kv_iterator.hpp
index 3abe37131..77b292fd5 100644
--- a/include/mapnik/feature_kv_iterator.hpp
+++ b/include/mapnik/feature_kv_iterator.hpp
@@ -46,7 +46,7 @@ class feature_impl;
 
 class MAPNIK_DECL feature_kv_iterator :
         public boost::iterator_facade<feature_kv_iterator,
-                                      std::tuple<std::string, value> const,
+                                      std::tuple<std::string , value> const,
                                       boost::forward_traversal_tag>
 {
 public:
diff --git a/src/feature_kv_iterator.cpp b/src/feature_kv_iterator.cpp
index 241908ab6..4ae384254 100644
--- a/src/feature_kv_iterator.cpp
+++ b/src/feature_kv_iterator.cpp
@@ -39,20 +39,16 @@ feature_kv_iterator::feature_kv_iterator (feature_impl const& f, bool begin)
 void feature_kv_iterator::increment()
 {
     ++itr_;
-    for ( ;itr_ != f_.ctx_->end(); ++itr_)
-    {
-        if (f_.has_key(itr_->first)) break;
-    }
 }
 
 void feature_kv_iterator::decrement()
 {
-    // no-op //--itr_;
+    // dummy //--itr_;
 }
 
 void feature_kv_iterator::advance(boost::iterator_difference<feature_kv_iterator>::type )
 {
-    // no-op
+    // dummy
 }
 
 bool feature_kv_iterator::equal( feature_kv_iterator const& other) const