Activity
Fix shutdown crash (#80)