Fixes #2250

Fixes #2250