diff --git a/plugins/DelayScan.form b/plugins/DelayScan.form
index 8bc58c5..fc8a37e 100644
--- a/plugins/DelayScan.form
+++ b/plugins/DelayScan.form
@@ -174,8 +174,8 @@
         </Component>
         <Component class="javax.swing.JSpinner" name="spinnerStart">
           <Properties>
-            <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="new javax.swing.SpinnerNumberModel(0.0d, 0.0d, 9999.0d, 1.0d)" type="code"/>
+            <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
+              <SpinnerModel initial="0.0" numberType="java.lang.Double" stepSize="1.0" type="number"/>
             </Property>
             <Property name="value" type="java.lang.Object" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
               <Connection code="0" type="code"/>
@@ -206,8 +206,8 @@
         </Component>
         <Component class="javax.swing.JSpinner" name="spinnerEnd">
           <Properties>
-            <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="new javax.swing.SpinnerNumberModel(50.0d, 0.0d, 60.0d, 1.0d)" type="code"/>
+            <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
+              <SpinnerModel initial="0.0" numberType="java.lang.Double" stepSize="1.0" type="number"/>
             </Property>
             <Property name="value" type="java.lang.Object" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
               <Connection code="50" type="code"/>
@@ -235,8 +235,8 @@
         </Component>
         <Component class="javax.swing.JSpinner" name="spinnerSize">
           <Properties>
-            <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="new javax.swing.SpinnerNumberModel(1.0d, -20.0d, 20.0d, 1.0d)" type="code"/>
+            <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
+              <SpinnerModel initial="0.0" numberType="java.lang.Double" stepSize="1.0" type="number"/>
             </Property>
             <Property name="value" type="java.lang.Object" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
               <Connection code="1" type="code"/>
diff --git a/plugins/DelayScan.java b/plugins/DelayScan.java
index 9e35d41..30bca8f 100644
--- a/plugins/DelayScan.java
+++ b/plugins/DelayScan.java
@@ -178,7 +178,7 @@ public class DelayScan extends Panel {
         jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
         jLabel1.setText("Delay start (ns):");
 
-        spinnerStart.setModel(new javax.swing.SpinnerNumberModel(0.0d, 0.0d, 9999.0d, 1.0d));
+        spinnerStart.setModel(new javax.swing.SpinnerNumberModel(Double.valueOf(0.0d), null, null, Double.valueOf(1.0d)));
         spinnerStart.setValue(0);
 
         jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
@@ -189,7 +189,7 @@ public class DelayScan extends Panel {
         jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
         jLabel3.setText("Delay end (ns):");
 
-        spinnerEnd.setModel(new javax.swing.SpinnerNumberModel(50.0d, 0.0d, 60.0d, 1.0d));
+        spinnerEnd.setModel(new javax.swing.SpinnerNumberModel(Double.valueOf(0.0d), null, null, Double.valueOf(1.0d)));
         spinnerEnd.setValue(50);
 
         jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
@@ -200,7 +200,7 @@ public class DelayScan extends Panel {
         jLabel8.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
         jLabel8.setText("Step size (ns):");
 
-        spinnerSize.setModel(new javax.swing.SpinnerNumberModel(1.0d, -20.0d, 20.0d, 1.0d));
+        spinnerSize.setModel(new javax.swing.SpinnerNumberModel(Double.valueOf(0.0d), null, null, Double.valueOf(1.0d)));
         spinnerSize.setValue(1);
 
         jLabel13.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);