First attempt to fix PendingIntents