Updated to be compatible with current `go` cmd