diff --git a/LR_Modules/dfpt_tetra_mod.f90 b/LR_Modules/dfpt_tetra_mod.f90
index 36d4fe8..2593942 100644
--- a/LR_Modules/dfpt_tetra_mod.f90
+++ b/LR_Modules/dfpt_tetra_mod.f90
@@ -196,6 +196,7 @@ SUBROUTINE dfpt_tetra_setup(et_col)
   USE start_k,    ONLY : nk1, nk2, nk3, k1, k2, k3
   USE symm_base,  ONLY : s, t_rev, time_reversal
   USE cell_base,  ONLY : at, bg
+  USE control_lr, ONLY : lgamma
   USE lr_symm_base,  ONLY : nsymq
   USE parameters,    ONLY : npk
   !
@@ -203,7 +204,7 @@ SUBROUTINE dfpt_tetra_setup(et_col)
   !
   REAL(dp),INTENT(OUT) :: et_col(nbnd, nkstot)
   !
-  INTEGER :: nktot
+  INTEGER :: nktot, kunit
   REAL(dp),ALLOCATABLE :: xk_col(:,:)
   !
   CALL poolcollect(nbnd, nks, et, nkstot, et_col)
@@ -219,9 +220,14 @@ SUBROUTINE dfpt_tetra_setup(et_col)
         nktot = nkstot
      END IF
      !
+     IF ( lgamma  ) THEN
+        kunit = 1
+     ELSE
+        kunit = 2
+     ENDIF
      IF(ALLOCATED(tetra)) DEALLOCATE(tetra)
      CALL opt_tetra_init(nsymq, s, time_reversal, t_rev, at, bg, npk, &
-                         k1, k2, k3, nk1, nk2, nk3, nktot, xk_col, 1)
+                         k1, k2, k3, nk1, nk2, nk3, nktot, xk_col, kunit)
      !
      DEALLOCATE(xk_col)
      !
diff --git a/PHonon/PH/prepare_q.f90 b/PHonon/PH/prepare_q.f90
index 49b582c..4f69ef4 100644
--- a/PHonon/PH/prepare_q.f90
+++ b/PHonon/PH/prepare_q.f90
@@ -214,7 +214,7 @@ SUBROUTINE prepare_q(auxdyn, do_band, do_iq, setup_pw, iq)
   IF ( done_iq(iq) ) do_band=.FALSE.
   !
   dfpt_tetra_linit = .FALSE.
-  IF(.NOT. setup_pw .AND. ltetra) dfpt_tetra_linit = .TRUE. 
+  IF((.NOT. setup_pw .OR. done_bands(iq)) .AND. ltetra) dfpt_tetra_linit = .TRUE. 
   !
   RETURN
   !