diff --git a/ram/portal/views.py b/ram/portal/views.py
index 1f72dd8..221de45 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -264,11 +264,12 @@ class GetManufacturerItem(View):
         else:
             roster = (
                 RollingStock.objects.get_published(request.user)
-                .order_by(*get_order_by_field())
                 .filter(
                     Q(manufacturer=manufacturer)
                     | Q(rolling_class__manufacturer=manufacturer)
                 )
+                .distinct()
+                .order_by(*get_order_by_field())
             )
             title = "Manufacturer: {0}".format(manufacturer)
 
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index 529927a..ba7ccb1 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.16.6"
+__version__ = "0.16.7"
 __version__ += git_suffix(__file__)