Fix for Go 1.0