Make Go 1.0 happy