Make the analysis working again