Compatibility with Go 1.1.1