Fixed buggy CDB generation