diff --git a/application/modules/courses/controllers/PublicViewController.php b/application/modules/courses/controllers/PublicViewController.php
index f9bf8a89a32adb685e59853269b7e6be684dfc5f..7b9791556e0cd520c9662c69cd104eee36623749 100644
--- a/application/modules/courses/controllers/PublicViewController.php
+++ b/application/modules/courses/controllers/PublicViewController.php
@@ -357,7 +357,13 @@ class Courses_PublicViewController extends App_Controller_Action {
 	    if ($id) {
 	        $course = Courses_CourseModel::findByCourseId($id);
 	    } else if ($subject && $courseNumber) {
-	        $course = Courses_CourseModel::findByCourseCode($subject, $courseNumber, $courseLetter);
+	        $criteria = array('subject' => $subject,
+                              'courseNumber' => $courseNumber,
+                              'courseLetter' => $courseLetter);
+	        $courses = Courses_CourseModel::findWithCriteria($criteria, true);
+	        if (count($courses) > 0) {
+	            $course = $courses->pop();
+	        }
 	    }