--- loncom/interface/lonnavmaps.pm	2020/07/19 15:48:18	1.509.2.11.2.2
+++ loncom/interface/lonnavmaps.pm	2020/03/05 23:12:23	1.509.2.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.509.2.11.2.2 2020/07/19 15:48:18 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.509.2.12 2020/03/05 23:12:23 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -3799,8 +3799,7 @@ sub next {
     # That ends the main iterator logic. Now, do we want to recurse
     # down this map (if this resource is a map)?
     if ( ($self->{HERE}->is_sequence() || (!$closeAllPages && $self->{HERE}->is_page())) &&
-        (defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION}) &&
-        ($env{'request.role.adv'} || !$self->{HERE}->randomout())) { 
+        (defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION})) {
         $self->{RECURSIVE_ITERATOR_FLAG} = 1;
         my $firstResource = $self->{HERE}->map_start();
         my $finishResource = $self->{HERE}->map_finish();
@@ -4819,12 +4818,11 @@ sub duedate {
     my $date;
     my @interval=$self->parmval("interval", $part);
     my $due_date=$self->parmval("duedate", $part);
-    if ($interval[0] =~ /^(\d+)/) {
-        my $timelimit = $1;
-        my $first_access=&Apache::lonnet::get_first_access($interval[1],
-                                                           $self->{SYMB});
+    if ($interval[0] =~ /\d+/) {
+       my $first_access=&Apache::lonnet::get_first_access($interval[1],
+                                                          $self->{SYMB});
 	if (defined($first_access)) {
-            my $interval = $first_access+$timelimit;
+           my $interval = $first_access+$interval[0];
 	    $date = (!$due_date || $interval < $due_date) ? $interval 
                                                           : $due_date;
 	} else {