Working on fixing analysis bug