Fix #46: Migration on Java 8 and Tomcat 8