diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
index b2f864101..b99ef3ff3 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
@@ -275,31 +275,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead
         /// <summary> Name set by the test, to be used as a part of the opto-data log file name </summary>
         public string BenchName;
 
-        ///
-        /// Volume of water from the opto telegram
-        ///
-        private Int64 lastVolumeRaw;        /// Last read raw volume
-        private double volumeLtr;
-        private double volumeLtr0;
-
-        /// Test start volume for metrology in liters
-        public double VolumeLtrStart { get { return VolumeFromSamples(optoData, optoDataCount, TestStartTelegramIx, ScalingFactor(), StartEndFilterSamplesCount2); } }
-        /// Test end volume for metrology in liters
-        public double VolumeLtrEnd { get { return VolumeFromSamples(optoData, optoDataCount, TestEndTelegramIx, ScalingFactor(), StartEndFilterSamplesCount2); } }
-
-		///
-        /// Timestamp from the opto telegram
-        ///
-        private Int64 lastTimestamp;
-        private double timestampSec;
-        private double timestampSec0;
-
-        public bool NoSamples { get { return (TimestampSecEnd - TimestampSecStart) < float.Epsilon; } }
-
-        /// Test start volume for metrology in seconds
-        public double TimestampSecStart { get { return TimeFromSamples(optoData, optoDataCount, TestStartTelegramIx, StartEndFilterSamplesCount2); } }
-        /// Test end time for metrology in seconds
-        public double TimestampSecEnd { get { return TimeFromSamples(optoData, optoDataCount, TestEndTelegramIx, StartEndFilterSamplesCount2); } }
 
         ///
         /// Indices to determine centers of start / end samples
@@ -313,6 +288,47 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead
         int currentTelegramIx;
         bool startSampleAcquired;
 
+		///
+        /// Timestamp from the opto telegram
+        ///
+        private Int64 lastTimestamp;
+        private double timestampSec;
+        private double timestampSec0;
+
+        /// Test start volume for metrology in seconds
+        public double TimestampSecStart
+        {
+            get { return TimeFromSamples(optoData, optoDataCount, TestStartTelegramIx, StartEndFilterSamplesCount2); }
+        }
+        /// Test end time for metrology in seconds
+        public double TimestampSecEnd
+        {
+            get { return TimeFromSamples(optoData, optoDataCount, TestEndTelegramIx, StartEndFilterSamplesCount2); }
+        }
+        /// 
+        public bool NoSamples
+        {
+            get { return TimestampSecStart == 0 || TimestampSecEnd == 0 || (TimestampSecEnd - TimestampSecStart) < float.Epsilon; }
+        }
+
+        ///
+        /// Volume of water from the opto telegram
+        ///
+        private Int64 lastVolumeRaw;        /// Last read raw volume
+        private double volumeLtr;
+        private double volumeLtr0;
+
+        /// Test start volume for metrology in liters
+        public double VolumeLtrStart
+        {
+            get { return NoSamples ? 0 : VolumeFromSamples(optoData, optoDataCount, TestStartTelegramIx, ScalingFactor(), StartEndFilterSamplesCount2); }
+        }
+        /// Test end volume for metrology in liters
+        public double VolumeLtrEnd
+        {
+            get { return NoSamples ? 0 : VolumeFromSamples(optoData, optoDataCount, TestEndTelegramIx, ScalingFactor(), StartEndFilterSamplesCount2); }
+        }
+
 
 		OptoTelegramRaw[] optoData;
 		int optoDataCount;
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 679a33bf0..632d211b0 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.26.1650.0")]
-[assembly: AssemblyFileVersion("2.26.1650.0")]
+[assembly: AssemblyVersion("2.26.1651.0")]
+[assembly: AssemblyFileVersion("2.26.1651.0")]