merge bugfix

Here it is a bug that Mode can be nil.

Created by  akkartik  on December 7, 2023
442XD5KJVHEBVDFOOL6EQJKSH26NIX2XULWNL7Q3WMF3YCICBP2AC
Change contents