diff --git a/lib/barby/barcode/code_25.rb b/lib/barby/barcode/code_25.rb
index <HASH>..<HASH> 100644
--- a/lib/barby/barcode/code_25.rb
+++ b/lib/barby/barcode/code_25.rb
@@ -97,6 +97,10 @@ module Barby
       end
     end
 
+    def encoding_for_bars_without_end_space(*a)
+      encoding_for_bars(*a).gsub(/0+$/, '')
+    end
+
 
     #Mod10
     def checksum
@@ -149,8 +153,7 @@ module Barby
     end
 
     def stop_encoding
-      #Removes trailing space generated by encoding_for_bars
-      encoding_for_bars(STOP_ENCODING).gsub(/0+$/, '')
+      encoding_for_bars_without_end_space(STOP_ENCODING)
     end
 
 
diff --git a/lib/barby/barcode/code_25_iata.rb b/lib/barby/barcode/code_25_iata.rb
index <HASH>..<HASH> 100644
--- a/lib/barby/barcode/code_25_iata.rb
+++ b/lib/barby/barcode/code_25_iata.rb
@@ -15,7 +15,7 @@ module Barby
     end
 
     def stop_encoding
-      encoding_for_bars(STOP_ENCODING)
+      encoding_for_bars_without_end_space(STOP_ENCODING)
     end
 
   end
Fix stop_encoding for IATA 2 of 5