Fixes #3882