Corrected analysis ordering again, hopefully for the last time.