Modified analysis bug