Tomcat fix ii