diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index dbe305588..65467725c 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -718,7 +718,7 @@ sub www_loadQuestions {
         $self->session->log->debug('No responseId, surveyEnd');
         return $self->surveyEnd();
     }
-    if($self->response->hasTimedOut()){
+    if($self->response->hasTimedOut($self->get('timeLimit'))){
         $self->session->log->debug('Response hasTimedOut, surveyEnd');
         return $self->surveyEnd();
     }
diff --git a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
index 060697f5c..25507c91c 100644
--- a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
@@ -91,7 +91,8 @@ sub freeze {
 
 sub hasTimedOut{
     my $self=shift;
-    return 1 if($self->{startTime} + ($self->{timeLimit} * 60) < time() and $self->{timeLimit} > 0);
+    my $limit = shift;
+    return 1 if($self->{startTime} + ($limit * 60) < time() and $limit > 0);
     return 0;
 }