Fixes #6780

Fixes #6780