fixed up gwt