diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90
index dd3f14181..62b87838f 100644
--- a/ccpp/driver/GFS_diagnostics.F90
+++ b/ccpp/driver/GFS_diagnostics.F90
@@ -4796,8 +4796,6 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
        ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%ebu_smoke(:,:)
       enddo
 
-      idx = idx + 1
-
       if (Model%ebb_dcycle == 2 ) then
 
       idx = idx + 1
@@ -4877,6 +4875,8 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
 
       endif smoke_forecast_mode
 
+
+      idx = idx + 1
       ExtDiag(idx)%axes = 3
       ExtDiag(idx)%name = 'ext550'
       ExtDiag(idx)%desc = '3d total extinction at 550nm'
diff --git a/ccpp/physics b/ccpp/physics
index 7eab4efc4..766360bf7 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 7eab4efc48f27d662eb372294361431aefae7900
+Subproject commit 766360bf7ec501d436bec92bf80f4a449f151114