Tomcat fix2