Fix issue 3881
Fix issue 3882, 3883