diff --git a/wire/core/WireSaveableItems.php b/wire/core/WireSaveableItems.php
index b911b5ae..323a43ec 100644
--- a/wire/core/WireSaveableItems.php
+++ b/wire/core/WireSaveableItems.php
@@ -319,7 +319,7 @@ abstract class WireSaveableItems extends Wire implements \IteratorAggregate {
 			$n = 0;
 			if(!strlen($name)) $name = $item->name; 
 			// ensure the new name is unique
-			while($this->get($name)) $name = $item->name . '_' . (++$n); 
+			while($this->get($name)) $name = rtrim($item->name, '_') . '_' . (++$n); 
 			$item->name = $name; 
 		}