Fix for bb cql change