GWT-555: correction