Fixing go 1.0 bug