FIXED: notification issues