GWF builder bug fixed