GWT-657: fix build