also fixing bug on push notification