Fix botched merge so Analysis works