Bugfix: GWT