Make it run with latest Go