Fix for tomcat 8