Update to latest Tomcat 7