tools.analyzer fix for TANAL-108