Fix for push notifications