Fix for BD-44(update for COUNT)