Fixes #1712

Fixes #1712