Fix Go 1.0 compatibility