Fix issue 4085
Fix issue 4085