Fix 3885
Merge pull request #4067 from schwabe/fix_3885

Fix 3885