Make compatible with Go 1.0