rebuildt analyzer issue-28