Prevent http://dev.vaadin.com/ticket/11502