Fixes #5190