fix #156 on the 2.2.1-GWT27 branch