Fix Tomcat regression