Issue2350

Fixes #2350