Added previous fix to Analisys tool too.