Important fix about GWC direct integration