Fix issue 3844
Fix issue 3841