diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 8f570bcf6c..33a2f6b4c4 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -7,7 +7,7 @@ import traceback
 import re
 import sys
 
-from datetime import datetime, timedelta
+from datetime import timedelta
 from django.conf import settings
 from lxml import etree
 from pkg_resources import resource_string
@@ -465,10 +465,11 @@ class CapaModule(XModule):
 
         # Problem queued. Students must wait XQUEUE_WAITTIME_BETWEEN_REQUESTS
         if self.lcp.is_queued():
-            current_time = datetime.now()
+            current_time = datetime.datetime.now()
             prev_submit_time = self.lcp.get_recentmost_queuetime() 
-            if (current_time-prev_submit_time).total_seconds() < settings.XQUEUE_WAITTIME_BETWEEN_REQUESTS:
-                msg = 'You must wait %d seconds between queueing requests' % settings.XQUEUE_WAITTIME_BETWEEN_REQUESTS
+            waittime_between_requests = settings.XQUEUE_WAITTIME_BETWEEN_REQUESTS
+            if (current_time-prev_submit_time).total_seconds() < waittime_between_requests:
+                msg = 'You must wait at least %d seconds between queue submissions' % waittime_between_requests
                 return {'success': msg, 'html': ''}
 
         try: