Make it work for Go 1.1