diff --git a/src/ao_two_e_ints/cholesky.irp.f b/src/ao_two_e_ints/cholesky.irp.f
index ce05de5b..f7eae638 100644
--- a/src/ao_two_e_ints/cholesky.irp.f
+++ b/src/ao_two_e_ints/cholesky.irp.f
@@ -43,11 +43,15 @@ BEGIN_PROVIDER [ integer, cholesky_ao_num ]
   double precision, external :: get_ao_two_e_integral
   logical, external :: ao_two_e_integral_zero
 
+  double precision, external      :: ao_two_e_integral
   integer :: block_size, iblock, ierr
 
   integer(omp_lock_kind), allocatable :: lock(:)
+  PROVIDE nucl_coord
 
-  PROVIDE ao_two_e_integrals_in_map
+  if (.not.do_direct_integrals) then
+    PROVIDE ao_two_e_integrals_in_map
+  endif
   deallocate(cholesky_ao)
 
   ndim = ao_num*ao_num
@@ -85,13 +89,22 @@ BEGIN_PROVIDER [ integer, cholesky_ao_num ]
     enddo
   enddo
 
-  !$OMP PARALLEL DO DEFAULT(SHARED) PRIVATE(i)
-  do i=1,ndim
-     D(i) = get_ao_two_e_integral(addr(1,i), addr(1,i), &
-                                  addr(2,i), addr(2,i), &
-                                  ao_integrals_map)
-  enddo
-  !$OMP END PARALLEL DO
+  if (do_direct_integrals) then
+    !$OMP PARALLEL DO DEFAULT(SHARED) PRIVATE(i)
+    do i=1,ndim
+       D(i) = ao_two_e_integral(addr(1,i), addr(2,i), &
+                                addr(1,i), addr(2,i))
+    enddo
+    !$OMP END PARALLEL DO
+  else
+    !$OMP PARALLEL DO DEFAULT(SHARED) PRIVATE(i)
+    do i=1,ndim
+       D(i) = get_ao_two_e_integral(addr(1,i), addr(1,i), &
+                                    addr(2,i), addr(2,i), &
+                                    ao_integrals_map)
+    enddo
+    !$OMP END PARALLEL DO
+  endif
 
   Dmax = maxval(D)
 
@@ -196,8 +209,13 @@ BEGIN_PROVIDER [ integer, cholesky_ao_num ]
         if ((0 < q).and.(q < k)) cycle
         if (.not.ao_two_e_integral_zero( addr(1,Lset(k)), addr(1,Dset(m)), &
                                     addr(2,Lset(k)), addr(2,Dset(m)) ) ) then
-           Delta(k,m) = get_ao_two_e_integral( addr(1,Lset(k)), addr(1,Dset(m)), &
+           if (do_direct_integrals) then
+             Delta(k,m) = ao_two_e_integral(addr(1,Lset(k)), addr(2,Lset(k)), &
+                                            addr(1,Dset(m)), addr(2,Dset(m)))
+           else
+             Delta(k,m) = get_ao_two_e_integral( addr(1,Lset(k)), addr(1,Dset(m)), &
                            addr(2,Lset(k)), addr(2,Dset(m)), ao_integrals_map)
+           endif
            if (q /= 0) Delta(q,m) = Delta(k,m)
         endif
       enddo
@@ -218,8 +236,13 @@ BEGIN_PROVIDER [ integer, cholesky_ao_num ]
         if ((0 < q).and.(q < p)) cycle
         if (.not.ao_two_e_integral_zero( addr(1,Dset(k)), addr(1,Dset(m)), &
                                     addr(2,Dset(k)), addr(2,Dset(m)) ) ) then
-          Delta(p,m) = get_ao_two_e_integral( addr(1,Dset(k)), addr(1,Dset(m)), &
+          if (do_direct_integrals) then
+            Delta(p,m) = ao_two_e_integral(addr(1,Dset(k)), addr(2,Dset(k)), &
+                                           addr(1,Dset(m)), addr(2,Dset(m)))
+          else
+            Delta(p,m) = get_ao_two_e_integral( addr(1,Dset(k)), addr(1,Dset(m)), &
                              addr(2,Dset(k)), addr(2,Dset(m)), ao_integrals_map)
+          endif
           if (q   /= 0) Delta(q,m) = Delta(p,m)
           if (j   /= 0) Delta(p,j) = Delta(p,m)
           if (q*j /= 0) Delta(q,j) = Delta(p,m)
diff --git a/src/ao_two_e_ints/two_e_integrals.irp.f b/src/ao_two_e_ints/two_e_integrals.irp.f
index 85ff5bcf..0c70aae5 100644
--- a/src/ao_two_e_ints/two_e_integrals.irp.f
+++ b/src/ao_two_e_ints/two_e_integrals.irp.f
@@ -1232,7 +1232,8 @@ subroutine compute_ao_integrals_jl(j,l,n_integrals,buffer_i,buffer_value)
   logical, external               :: ao_two_e_integral_zero
 
   integer                         :: i,k
-  double precision                :: ao_two_e_integral,cpu_1,cpu_2, wall_1, wall_2
+  double precision, external      :: ao_two_e_integral
+  double precision                :: cpu_1,cpu_2, wall_1, wall_2
   double precision                :: integral, wall_0
   double precision                :: thr
   integer                         :: kk, m, j1, i1
diff --git a/src/mo_two_e_ints/mo_bi_integrals.irp.f b/src/mo_two_e_ints/mo_bi_integrals.irp.f
index 0ed6f373..0d3fe176 100644
--- a/src/mo_two_e_ints/mo_bi_integrals.irp.f
+++ b/src/mo_two_e_ints/mo_bi_integrals.irp.f
@@ -37,7 +37,9 @@ BEGIN_PROVIDER [ logical, mo_two_e_integrals_in_map ]
     call map_load_from_disk(trim(ezfio_filename)//'/work/mo_ints',mo_integrals_map)
     print*, 'MO integrals provided'
     return
-  else
+  endif
+
+  if (.not. do_direct_integrals) then
     PROVIDE ao_two_e_integrals_in_map
   endif
 
diff --git a/src/tools/four_idx_transform.irp.f b/src/tools/four_idx_transform.irp.f
index f7520e71..92e87cad 100644
--- a/src/tools/four_idx_transform.irp.f
+++ b/src/tools/four_idx_transform.irp.f
@@ -14,13 +14,6 @@ program four_idx_transform
 
   io_mo_two_e_integrals = 'Write'
   SOFT_TOUCH io_mo_two_e_integrals
-  if (.true.) then
-    PROVIDE ao_two_e_integrals_in_map
-  endif
-  if (do_ao_cholesky) then
-    PROVIDE cholesky_mo_transp
-    FREE cholesky_ao
-  endif
   if (.true.) then
     PROVIDE mo_two_e_integrals_in_map
   endif