Move return for go 1.0 compatability