Fixed for cql