Fixes #4043