Badge count fix