Fix all indicators value computation