Now works with Go 1