Fix hang issue on Go 1.1