Fixes #6137