diff --git a/Workplace/Enums.cs b/Workplace/Enums.cs
index 3a451f607..63cc894db 100644
--- a/Workplace/Enums.cs
+++ b/Workplace/Enums.cs
@@ -5,7 +5,7 @@
         public const int ExtraPieces = 10;
         public const int NrGeneratorsCount = 5;
         public const int MinGeneratedNr = 300000000;
-        public const int MaxPredefinedOrderNr = 1000;
+        public const long MaxPredefinedOrderNr = 1000;
     }
 
     public enum OrderProgress
diff --git a/Workplace/Properties/AssemblyInfo.cs b/Workplace/Properties/AssemblyInfo.cs
index 0a6b5fb3e..730a38863 100644
--- a/Workplace/Properties/AssemblyInfo.cs
+++ b/Workplace/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.16.0")]
-[assembly: AssemblyFileVersion("3.1.16.0")]
+[assembly: AssemblyVersion("3.1.17.0")]
+[assembly: AssemblyFileVersion("3.1.17.0")]
diff --git a/Workplace/WorkplaceDlg.cs b/Workplace/WorkplaceDlg.cs
index 2895b22f9..4a76cd443 100644
--- a/Workplace/WorkplaceDlg.cs
+++ b/Workplace/WorkplaceDlg.cs
@@ -335,8 +335,8 @@ namespace Workplace
 
                     for (int i = list.Count - 1; i >= 0; i--)
                     {
-                        int orderNr;
-                        if (!int.TryParse(list[i].POName, out orderNr) || orderNr - 1 < predefinedOrders.Length)
+                        long orderNr;
+                        if (!long.TryParse(list[i].POName, out orderNr) || orderNr - 1 < predefinedOrders.Length)
                         {
                             list.RemoveAt(i);
                         }
@@ -1901,12 +1901,11 @@ namespace Workplace
                 }
             }
 
-            int orderNr;
+            long orderNr;
             OrderInfo order;
             ///
             if (string.IsNullOrEmpty(orderComboBox.Text) ||
-                orderComboBox.Text.Length != 7 ||
-                !int.TryParse(orderComboBox.Text, out orderNr) ||
+                !long.TryParse(orderComboBox.Text, out orderNr) ||
                 orderNr <= Cnst.MaxPredefinedOrderNr ||
                 (order = orders.FirstOrDefault(x => x.POName == orderComboBox.Text)) == null)
             {