Fixes issue #45 for the vaadin6 branch