Making compatible with go1.1