--- rat/lonwrapper.pm	2017/05/07 13:58:04	1.61
+++ rat/lonwrapper.pm	2017/05/08 14:20:32	1.62
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.61 2017/05/07 13:58:04 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.62 2017/05/08 14:20:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -183,7 +183,7 @@ sub handler {
 
     if ($url =~ /\.pdf$/i) {
         $is_pdf = 1;
-    } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/exttool$}) {
+    } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
         $cdom = $1;
         $cnum = $2;
         my $marker = $3;
@@ -252,7 +252,7 @@ sub handler {
 #
 # Actual URL
 #
-    if ($url=~/$LONCAPA::assess_re/) {
+    if (($url=~/$LONCAPA::assess_re/) && (!$exttool)) {
 #
 # This is uploaded homework
 #