Activity selection bug hotfix