changes to ensure backward compatibility with tomcat