Fixup for go