Fixes #2790

Fixes #2790
I think yes,