fixed issue with CB rows being included