Fixes #6869