Fixes #3993