[analysis] BUGFIX for iss #13