1st attempt to fix badge count issue