Fixes #6679