Fix for go 1.4