Fixed BitCount issue