analysis builder bug fix