Another attempt to get notifications working again