Fixed Tomcat 6 and Java 6