Fixes #6063

Fixes #6063