TomCat support fix