fix notification problems & crash