Fixes #6592

Fixes #6592