Fix for new Jetty/Tomcat