fix go1.0 implementation