CQL loading fix.