Fixes #6780