Activity service bugfix