add more check for push notifications