diff --git a/SAS/MoM/MoMQueryService/MoMQueryServiceServer/momqueryservice.py b/SAS/MoM/MoMQueryService/MoMQueryServiceServer/momqueryservice.py
index ed0a3285e51b36670566608cb85b7889474ee999..57ba49cdf9fbb11ea4ae3841542c5b7d1de39f4e 100755
--- a/SAS/MoM/MoMQueryService/MoMQueryServiceServer/momqueryservice.py
+++ b/SAS/MoM/MoMQueryService/MoMQueryServiceServer/momqueryservice.py
@@ -1190,13 +1190,13 @@ where project.mom2id = %s and (project_role.name = "Pi" or project_role.name = "
             if "trigger_id" not in misc:
                 raise NotImplementedError("TimeWindow specified for a non-triggered observation %s" % mom_id)
             if "minStartTime" in time_window:
-                result["minStartTime"] = parseDatetime(time_window["minStartTime"].replace('T', ' '))  # The T is from XML
+                result["minStartTime"] = time_window["minStartTime"].replace('T', ' ')  # The T is from XML
             if "maxDuration" in time_window:
-                result["maxDuration"] = timedelta(seconds=int(time_window["maxDuration"]))
+                result["maxDuration"] = timedelta(seconds=float(time_window["maxDuration"]))
             if "minDuration" in time_window:
-                result["minDuration"] = timedelta(seconds=int(time_window["minDuration"]))
+                result["minDuration"] = timedelta(seconds=float(time_window["minDuration"]))
             if "maxEndTime" in time_window:
-                result["maxEndTime"] = parseDatetime(time_window["maxEndTime"].replace('T', ' '))  # The T is from XML
+                result["maxEndTime"] = time_window["maxEndTime"].replace('T', ' ')  # The T is from XML
         return result
 
     def get_station_selection(self, mom_id):
diff --git a/SAS/MoM/MoMQueryService/test/t_momqueryservice.py b/SAS/MoM/MoMQueryService/test/t_momqueryservice.py
index 501c543f3a5df243a65b7acb7d4221a012d4e6cf..400562c9a38002a711a71e75abbb08439605b57f 100755
--- a/SAS/MoM/MoMQueryService/test/t_momqueryservice.py
+++ b/SAS/MoM/MoMQueryService/test/t_momqueryservice.py
@@ -1851,7 +1851,7 @@ class TestMoMDatabaseWrapper(unittest.TestCase):
         min_start_time = u"2017-01-01T12:00:00"
         max_end_time = u"2017-01-04T01:00:00"
         min_duration = 300
-        max_duration = 600
+        max_duration = 600.1
 
         timewindow = {u"minStartTime": min_start_time,
                       u"maxEndTime": max_end_time,
@@ -1864,8 +1864,8 @@ class TestMoMDatabaseWrapper(unittest.TestCase):
         result = self.mom_database_wrapper.get_trigger_time_restrictions(self.mom_id)
 
         self.assertEqual(result['trigger_id'], self.trigger_id)
-        self.assertEqual(result['minStartTime'], parseDatetime(min_start_time.replace('T', ' ')))
-        self.assertEqual(result['maxEndTime'], parseDatetime(max_end_time.replace('T', ' ')))
+        self.assertEqual(result['minStartTime'], min_start_time.replace('T', ' '))
+        self.assertEqual(result['maxEndTime'], max_end_time.replace('T', ' '))
         self.assertEqual(result['minDuration'], timedelta(seconds=min_duration))
         self.assertEqual(result['maxDuration'], timedelta(seconds=max_duration))
 
diff --git a/SAS/ResourceAssignment/Common/lib/specification.py b/SAS/ResourceAssignment/Common/lib/specification.py
index d543138287927e22866c19d27aabec579864d7a7..9d21fe6bf092c96a08772c4b6a68adcd98d627be 100644
--- a/SAS/ResourceAssignment/Common/lib/specification.py
+++ b/SAS/ResourceAssignment/Common/lib/specification.py
@@ -205,13 +205,13 @@ class Specification:
                 self.logger.info("Received misc field from MoM: %s", misc)
                 if misc:
                     if "minStartTime" in misc:
-                        self.min_starttime = misc["minStartTime"]
+                        self.min_starttime = parseDatetime(misc["minStartTime"])
                     if "minDuration" in misc:
-                        self.max_duration = misc["maxDuration"]
+                        self.max_duration = timedelta(seconds=misc["maxDuration"])
                     if "maxDuration" in misc:
-                        self.min_duration = misc["minDuration"]
+                        self.min_duration = timedelta(seconds=misc["minDuration"])
                     if "maxEndTime" in misc:
-                        self.max_endtime = misc["maxEndTime"]
+                        self.max_endtime = parseDatetime(misc["maxEndTime"])
                     if "trigger_id" in misc:
                         self.trigger_id = misc["trigger_id"]
                         self.logger.info('Found a task mom_id=%s with a trigger_id=%s', self.mom_id, self.trigger_id)