Fixed an issue with push notifications macro