update for go 1.1