Fix for go1, specifically 1.0.3