diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb
index 9695bb76100bb623deb827425b7a35f8f8f5a41f..ee268a9b7d0b75b3c5873ece185ab0279f6a5bb2 100644
--- a/lib/refrepo/gen/wiki/generators/hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/hardware.rb
@@ -86,7 +86,7 @@ class G5KHardwareGenerator < WikiGenerator
               [
                 {
                   text: v['interface'] + ' ' + G5K.get_rate(v['rate']),
-                  sort: v['interface'] + ' ' + ((v['rate'])/10**6).to_s.rjust(6, '0') + ' Gbps'
+                  sort: v['interface'] + ' ' +  G5K.get_rate(v['rate'], :sortable)
                 }
               ]
             }
diff --git a/lib/refrepo/gen/wiki/mw_utils.rb b/lib/refrepo/gen/wiki/mw_utils.rb
index 690051cd9443197d899ab1fa9a23a1f6ed7ecddc..6a9654753e40069e521e4eb40874196728bf96ae 100644
--- a/lib/refrepo/gen/wiki/mw_utils.rb
+++ b/lib/refrepo/gen/wiki/mw_utils.rb
@@ -102,7 +102,11 @@ module G5K
     end
   end
 
-  def self.get_rate(x)
+  def self.get_rate(x, unit=:auto)
+    if unit == :sortable
+      return '000000' if x.nil?
+      return (x.to_f / 10**6).floor.to_s.rjust(6, '0')
+    end
     return '' if (x == 0 || x.nil?)
     mbps = (x.to_f / 10**6).floor
     if mbps < 1000