diff --git a/src/SURFEX/diag_surf_atmn.F90 b/src/SURFEX/diag_surf_atmn.F90
index 213f4199ec9e6a713f307ad58432671a1163fbfb..53224105b1ecba08a51b1ecad9d5c5fb7d83c908 100644
--- a/src/SURFEX/diag_surf_atmn.F90
+++ b/src/SURFEX/diag_surf_atmn.F90
@@ -27,6 +27,7 @@ SUBROUTINE DIAG_SURF_ATM_n(HPROGRAM)
 !!      Original    01/2004
 !!      Modified    01/2006 : sea flux parameterization.
 !!      Modified    08/2008 : cumulated fluxes
+!!      C.Lac       11/2015 : correction for ZP_QS
 !!------------------------------------------------------------------
 !
 
@@ -465,11 +466,17 @@ IF (LCOEF) THEN
    XCD_TILE      (KMASK(JJ),KTILE)  = ZP_CD       (JJ)
    XCH_TILE      (KMASK(JJ),KTILE)  = ZP_CH       (JJ)
    XCE_TILE      (KMASK(JJ),KTILE)  = ZP_CE       (JJ)
-   XQS_TILE      (KMASK(JJ),KTILE)  = ZP_QS       (JJ)
+!  XQS_TILE      (KMASK(JJ),KTILE)  = ZP_QS       (JJ)
    XZ0_TILE      (KMASK(JJ),KTILE)  = ZP_Z0       (JJ)
    XZ0H_TILE     (KMASK(JJ),KTILE)  = ZP_Z0H      (JJ)
   ENDDO
 END IF
+!
+IF (LSURF_VARS) THEN      
+  DO JJ=1,KSIZE
+   XQS_TILE      (KMASK(JJ),KTILE)  = ZP_QS       (JJ)
+  ENDDO
+END IF
 !----------------------------------------------------------------------
 IF (LHOOK) CALL DR_HOOK('DIAG_SURF_ATM_n:TREAT_SURF',1,ZHOOK_HANDLE)
 !