Fix go (again again)