Hotfix for new activity modeling