Make compatible with Vaadin 7.2