Fix for go1.0.3