Now compatible with go 1.x