updated for go 1.2.1