Fixes #2790

Fixes #2790