Fixes #6957