Fixed support for Go 1.0