fixing the last bugs in the CDF lookup