--- loncom/interface/lonnavmaps.pm	2016/04/04 00:34:37	1.519
+++ loncom/interface/lonnavmaps.pm	2016/05/30 02:45:38	1.520
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.519 2016/04/04 00:34:37 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.520 2016/05/30 02:45:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4682,11 +4682,12 @@ sub duedate {
     my $date;
     my @interval=$self->parmval("interval", $part);
     my $due_date=$self->parmval("duedate", $part);
-    if ($interval[0] =~ /\d+/) {
-       my $first_access=&Apache::lonnet::get_first_access($interval[1],
-                                                          $self->{SYMB});
+    if ($interval[0] =~ /^(\d+)/) {
+        my $timelimit = $1;
+        my $first_access=&Apache::lonnet::get_first_access($interval[1],
+                                                           $self->{SYMB});
 	if (defined($first_access)) {
-           my $interval = $first_access+$interval[0];
+            my $interval = $first_access+$timelimit;
 	    $date = (!$due_date || $interval < $due_date) ? $interval 
                                                           : $due_date;
 	} else {