Fixing broken GOPATH support