Workaround Tomcat bug