diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java
index 922f3fca2..bbcb9ce24 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java
@@ -22,7 +22,7 @@ public class FreeMarkerSetup implements ServletContextListener {
 
 		ServletContext sc = event.getServletContext();	
 		sc.setAttribute("themeToConfigMap", new HashMap<String, Configuration>());
-        BaseTemplateModel.context = sc;
+        BaseTemplateModel.setServletContext(sc);
         FreeMarkerComponentGenerator.setServletContext(sc);
 		UrlBuilder.contextPath = sc.getContextPath();
 	}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModel.java
index 0a88bfeef..82c7f13de 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModel.java
@@ -14,7 +14,7 @@ public abstract class BaseTemplateModel {
 
     private static final Log log = LogFactory.getLog(BaseTemplateModel.class.getName());
     
-    public static ServletContext context = null;
+    protected static ServletContext servletContext = null;
 
     // Wrap UrlBuilder method so templates can call ${item.url}
     public String getUrl(String path) {
@@ -26,6 +26,14 @@ public abstract class BaseTemplateModel {
         return UrlBuilder.getUrl(path, params);
     }
 
+    public static ServletContext getServletContext() {
+        return servletContext;
+    }
+
+    public static void setServletContext(ServletContext context) {
+        BaseTemplateModel.servletContext = context;
+    }
+
     /*
      * public static List<?> wrapList(List<?> list, Class cl) 
      * throw error if cl not a child of ViewObject
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/IndividualTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/IndividualTemplateModel.java
index e4fcfad38..19ba23a73 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/IndividualTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/IndividualTemplateModel.java
@@ -56,7 +56,7 @@ public class IndividualTemplateModel extends BaseTemplateModel {
     
     private String getView(ClassView view) {
         ViewFinder vf = new ViewFinder(view);
-        return vf.findClassView(individual, context);
+        return vf.findClassView(individual, servletContext);
     }
     
     public Link getPrimaryLink() {