diff --git a/include/mapnik/feature_style_processor.hpp b/include/mapnik/feature_style_processor.hpp
index c9bff0f4a..b0b7d29bb 100644
--- a/include/mapnik/feature_style_processor.hpp
+++ b/include/mapnik/feature_style_processor.hpp
@@ -148,6 +148,13 @@ private:
         {
             
             box2d<double> ext = m_.get_buffered_extent();
+
+            // clip buffered extent by maximum extent, if supplied
+            boost::optional<box2d<double> > const& maximum_extent = m_.maximum_extent();
+            if (maximum_extent) {
+                ext.clip(*maximum_extent);
+            }
+
             projection proj1(lay.srs());
             proj_transform prj_trans(proj0,proj1);