Fix go 1.0 compatibility