Analytics bug fix

Fixed bug where analytics would get leaked by some activities