Upgrade to using Vaadin 6.8.13