Fixed for GWT.