Fixes #5050