fixed for Analze