diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0313f81f3..03665cf59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ Released ...
 
 Summary: TODO
 
+- AGG renderer: fixed geometry offsetting to work after smoothing to produce more consistent results (#2202)
+
 - AGG renderer: increased `vertex_dist_epsilon` to ensure nearly coincident points are discarded more readily (#2196)
 
 - GDAL plugin: Added back support for user driven `nodata` on rgb(a) images (#2023)
diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index f35a3405b..9763c5838 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -82,8 +82,10 @@ void agg_renderer<T>::process(line_symbolizer const& sym,
     typedef agg::pixfmt_custom_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_comp_type;
     typedef agg::renderer_base<pixfmt_comp_type> renderer_base;
     typedef boost::mpl::vector<clip_line_tag, transform_tag,
-                               offset_transform_tag, affine_transform_tag,
-                               simplify_tag, smooth_tag, dash_tag, stroke_tag> conv_types;
+                               affine_transform_tag,
+                               simplify_tag, smooth_tag,
+                               offset_transform_tag,
+                               dash_tag, stroke_tag> conv_types;
 
     pixfmt_comp_type pixf(buf);
     pixf.comp_op(static_cast<agg::comp_op_e>(sym.comp_op()));
diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp
index ce51fc304..621ee99d5 100644
--- a/src/cairo_renderer.cpp
+++ b/src/cairo_renderer.cpp
@@ -450,8 +450,10 @@ void cairo_renderer_base::process(line_symbolizer const& sym,
                                   proj_transform const& prj_trans)
 {
     typedef boost::mpl::vector<clip_line_tag, transform_tag,
-                               offset_transform_tag, affine_transform_tag,
-                               simplify_tag, smooth_tag, dash_tag, stroke_tag> conv_types;
+                               affine_transform_tag,
+                               simplify_tag, smooth_tag,
+                               offset_transform_tag,
+                               dash_tag, stroke_tag> conv_types;
     cairo_save_restore guard(context_);
     mapnik::stroke const& stroke_ = sym.get_stroke();
     context_.set_operator(sym.comp_op());
diff --git a/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-agg-reference.png b/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-agg-reference.png
index 8890b6920..77c68f69e 100644
Binary files a/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-cairo-reference.png b/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-cairo-reference.png
index c25ee7ede..7ab02a05f 100644
Binary files a/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-cairo-reference.png and b/tests/visual_tests/images/line-smooth-and-offset-512-512-1.0-cairo-reference.png differ
diff --git a/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-agg-reference.png b/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-agg-reference.png
index 808b97d0a..5b1b3004b 100644
Binary files a/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-agg-reference.png and b/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-cairo-reference.png b/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-cairo-reference.png
index 591f3141c..0afbde7b7 100644
Binary files a/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-cairo-reference.png and b/tests/visual_tests/images/line-smooth-and-offset-512-512-2.0-cairo-reference.png differ