try to make it work with go 1.0